Enable extended desktop by default.
Added debug only shortcut to activate screen locker.
BUG=123160
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10800095
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148297 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 8e346a7..e4528f23 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -59,32 +59,14 @@
DISALLOW_COPY_AND_ASSIGN(ModalWidgetDelegate);
};
+internal::MultiDisplayManager* GetDisplayManager() {
+ return static_cast<internal::MultiDisplayManager*>(
+ aura::Env::GetInstance()->display_manager());
+}
+
} // namespace
-class ExtendedDesktopTest : public test::AshTestBase {
- public:
- ExtendedDesktopTest() {}
- virtual ~ExtendedDesktopTest() {}
-
- virtual void SetUp() OVERRIDE {
- internal::DisplayController::SetExtendedDesktopEnabled(true);
- AshTestBase::SetUp();
- }
-
- virtual void TearDown() OVERRIDE {
- AshTestBase::TearDown();
- internal::DisplayController::SetExtendedDesktopEnabled(false);
- }
-
- protected:
- internal::MultiDisplayManager* display_manager() {
- return static_cast<internal::MultiDisplayManager*>(
- aura::Env::GetInstance()->display_manager());
- }
-
- private:
- DISALLOW_COPY_AND_ASSIGN(ExtendedDesktopTest);
-};
+typedef test::AshTestBase ExtendedDesktopTest;
// Test conditions that root windows in extended desktop mode
// must satisfy.
@@ -461,10 +443,10 @@
UpdateDisplay("1000x600,600x400");
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
gfx::Display& display_1 =
- display_manager()->FindDisplayForRootWindow(root_windows[0]);
+ GetDisplayManager()->FindDisplayForRootWindow(root_windows[0]);
EXPECT_EQ("0,0", display_1.bounds().origin().ToString());
gfx::Display& display_2 =
- display_manager()->FindDisplayForRootWindow(root_windows[1]);
+ GetDisplayManager()->FindDisplayForRootWindow(root_windows[1]);
EXPECT_EQ("1000,0", display_2.bounds().origin().ToString());
aura::Window* d1 =
@@ -494,7 +476,7 @@
Shell::GetInstance()->display_controller()->SetSecondaryDisplayLayout(
internal::DisplayController::BOTTOM);
- display_2 = display_manager()->FindDisplayForRootWindow(root_windows[1]);
+ display_2 = GetDisplayManager()->FindDisplayForRootWindow(root_windows[1]);
EXPECT_EQ("0,600", display_2.bounds().origin().ToString());
// Convert point in Root2's window to Root1's window Coord.
