Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2445)

Unified Diff: ash/display/multi_display_manager_unittest.cc

Issue 10827184: Disabling extended desktop (by default). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/multi_display_manager_unittest.cc
diff --git a/ash/display/multi_display_manager_unittest.cc b/ash/display/multi_display_manager_unittest.cc
index 99e133c59bc4a6cddc11ed3dc796a023abf6f76f..4b52fa231a7a32edefe04516081383c162da7633 100644
--- a/ash/display/multi_display_manager_unittest.cc
+++ b/ash/display/multi_display_manager_unittest.cc
@@ -32,6 +32,7 @@ class MultiDisplayManagerTest : public test::AshTestBase,
virtual ~MultiDisplayManagerTest() {}
virtual void SetUp() OVERRIDE {
+ internal::DisplayController::SetExtendedDesktopEnabled(true);
AshTestBase::SetUp();
display_manager()->AddObserver(this);
Shell::GetPrimaryRootWindow()->AddObserver(this);
@@ -40,6 +41,7 @@ class MultiDisplayManagerTest : public test::AshTestBase,
Shell::GetPrimaryRootWindow()->RemoveObserver(this);
display_manager()->RemoveObserver(this);
AshTestBase::TearDown();
+ internal::DisplayController::SetExtendedDesktopEnabled(false);
}
aura::DisplayManager* display_manager() {
« no previous file with comments | « ash/display/display_controller_unittest.cc ('k') | ash/extended_desktop_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698