Turn on unified mode by default

BUG=501078
TEST=unit tests are updated

Review URL: https://codereview.chromium.org/1178943008

Cr-Commit-Position: refs/heads/master@{#335196}

8 files changed, 25 insertions, 29 deletions

diff --git a/ash/display/display_layout.cc b/ash/display/display_layout.cc
index 9d8942e..2cf54a6 100644
--- a/ash/display/display_layout.cc
+++ b/ash/display/display_layout.cc
@@ -4,6 +4,7 @@
 
 #include "ash/display/display_layout.h"
 
+#include "ash/ash_switches.h"
 #include "ash/display/display_pref_util.h"
 #include "base/json/json_value_converter.h"
 #include "base/logging.h"
@@ -70,7 +71,11 @@ DisplayLayout::DisplayLayout()
     : position(RIGHT),
       offset(0),
       mirrored(false),
+#if defined(OS_CHROMEOS)
+      default_unified(switches::UnifiedDesktopEnabled()),
+#else
       default_unified(false),
+#endif
       primary_id(gfx::Display::kInvalidDisplayID) {
 }
 
@@ -78,7 +83,11 @@ DisplayLayout::DisplayLayout(DisplayLayout::Position position, int offset)
     : position(position),
       offset(offset),
       mirrored(false),
+#if defined(OS_CHROMEOS)
+      default_unified(switches::UnifiedDesktopEnabled()),
+#else
       default_unified(false),
+#endif
       primary_id(gfx::Display::kInvalidDisplayID) {
   DCHECK_LE(TOP, position);
   DCHECK_GE(LEFT, position);
diff --git a/ash/display/display_layout_store.cc b/ash/display/display_layout_store.cc
index 436b1937..3ef9134 100644
--- a/ash/display/display_layout_store.cc
+++ b/ash/display/display_layout_store.cc
@@ -48,7 +48,13 @@ void DisplayLayoutStore::RegisterLayoutForDisplayIdPair(
     int64 id1,
     int64 id2,
     const DisplayLayout& layout) {
-  paired_layouts_[std::make_pair(id1, id2)] = layout;
+  auto key = std::make_pair(id1, id2);
+  paired_layouts_[key] = layout;
+#if defined(OS_CHROMEOS)
+  // Force disabling unified desktop if the flag is not set.
+  if (!switches::UnifiedDesktopEnabled())
+    paired_layouts_[key].default_unified = false;
+#endif
 }
 
 DisplayLayout DisplayLayoutStore::GetRegisteredDisplayLayout(
@@ -88,9 +94,6 @@ void DisplayLayoutStore::UpdatePrimaryDisplayId(const DisplayIdPair& pair,
 DisplayLayout DisplayLayoutStore::CreateDisplayLayout(
     const DisplayIdPair& pair) {
   DisplayLayout layout = default_display_layout_;
-  layout.default_unified =
-      Shell::GetInstance()->display_manager()->default_multi_display_mode() ==
-      DisplayManager::UNIFIED;
   layout.primary_id = pair.first;
   paired_layouts_[pair] = layout;
   return layout;
diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
index bb8dafe..519ddb5 100644
--- a/ash/display/display_manager_unittest.cc
+++ b/ash/display/display_manager_unittest.cc
@@ -1505,10 +1505,7 @@ TEST_F(DisplayManagerTest, UnifiedDesktopBasic) {
 
   UpdateDisplay("300x200,400x500");
 
-  // Switch to unified desktop.
-  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-  display_manager()->ReconfigureDisplays();
-
+  // Defaults to the unified desktop.
   gfx::Screen* screen =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
   EXPECT_EQ("700x500", screen->GetPrimaryDisplay().size().ToString());
@@ -1542,7 +1539,6 @@ TEST_F(DisplayManagerTest, ConfigureUnifiedTwice) {
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
-  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
   UpdateDisplay("300x200,400x500");
   // Mirror windows are created in a posted task.
   RunAllPendingInMessageLoop();
@@ -1559,8 +1555,6 @@ TEST_F(DisplayManagerTest, RotateUnifiedDesktop) {
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
-  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-  display_manager()->SetMultiDisplayMode(DisplayManager::UNIFIED);
   UpdateDisplay("300x200,400x500");
 
   gfx::Screen* screen =
@@ -1588,8 +1582,6 @@ TEST_F(DisplayManagerTest, UnifiedWithDockWindows) {
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
-  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-  display_manager()->SetMultiDisplayMode(DisplayManager::UNIFIED);
   UpdateDisplay("300x200,400x500");
 
   scoped_ptr<aura::Window> docked(
diff --git a/ash/display/unified_mouse_warp_controller_unittest.cc b/ash/display/unified_mouse_warp_controller_unittest.cc
index ecbf496..fa450ce 100644
--- a/ash/display/unified_mouse_warp_controller_unittest.cc
+++ b/ash/display/unified_mouse_warp_controller_unittest.cc
@@ -4,8 +4,6 @@
 
 #include "ash/display/unified_mouse_warp_controller.h"
 
-#include "ash/display/display_layout_store.h"
-#include "ash/display/display_manager.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ -25,9 +23,6 @@ class UnifiedMouseWarpControllerTest : public test::AshTestBase {
   void SetUp() override {
     test::AshTestBase::SetUp();
     test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
-    DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-    display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-    display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);
   }
 
  protected:
diff --git a/ash/magnifier/magnification_controller_unittest.cc b/ash/magnifier/magnification_controller_unittest.cc
index aeb89df..20dfb43 100644
--- a/ash/magnifier/magnification_controller_unittest.cc
+++ b/ash/magnifier/magnification_controller_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "ash/magnifier/magnification_controller.h"
 
-#include "ash/display/display_manager.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
@@ -673,10 +672,6 @@ TEST_F(MagnificationControllerTest, EnableMagnifierInUnifiedDesktop) {
     return;
   test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
 
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-  display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);
-
   EXPECT_EQ(1.0f, GetMagnificationController()->GetScale());
 
   GetMagnificationController()->SetEnabled(true);
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 8189581..88e254f 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -295,9 +295,6 @@ TEST_F(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
     return;
   test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
 
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-  display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);
   UpdateDisplay("500x500");
   const int kLockScreenWindowId = 1000;
   const int kLockBackgroundWindowId = 1001;
@@ -338,6 +335,7 @@ TEST_F(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
   EXPECT_EQ("0,0 500x500", lock_screen->GetNativeWindow()->bounds().ToString());
 
   // Switch to mirror.
+  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   display_manager->SetMirrorMode(true);
   EXPECT_TRUE(display_manager->IsInMirrorMode());
 
diff --git a/ash/shelf/shelf_layout_manager_unittest.cc b/ash/shelf/shelf_layout_manager_unittest.cc
index e09f5fd..b737e80 100644
--- a/ash/shelf/shelf_layout_manager_unittest.cc
+++ b/ash/shelf/shelf_layout_manager_unittest.cc
@@ -22,6 +22,7 @@
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/test/ash_test_base.h"
+#include "ash/test/display_manager_test_api.h"
 #include "ash/test/shelf_test_api.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
@@ -2342,10 +2343,8 @@ TEST_F(ShelfLayoutManagerTest, ShutdownHandlesWindowActivation) {
 TEST_F(ShelfLayoutManagerTest, ShelfLayoutInUnifiedDesktop) {
   if (!SupportsMultipleDisplays())
     return;
+  test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
 
-  DisplayManager* display_manager = Shell::GetInstance()->display_manager();
-  display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-  display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);
   UpdateDisplay("500x500, 500x500");
 
   StatusAreaWidget* status_area_widget =
diff --git a/ash/test/display_manager_test_api.cc b/ash/test/display_manager_test_api.cc
index 751553dc..7627289 100644
--- a/ash/test/display_manager_test_api.cc
+++ b/ash/test/display_manager_test_api.cc
@@ -8,6 +8,7 @@
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
+#include "ash/display/display_layout_store.h"
 #include "ash/display/display_manager.h"
 #include "ash/display/display_util.h"
 #include "ash/display/extended_mouse_warp_controller.h"
@@ -99,6 +100,10 @@ void DisplayManagerTestApi::EnableUnifiedDesktopForTest() {
 #if defined(OS_CHROMEOS)
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kAshEnableUnifiedDesktop);
+  Shell::GetInstance()
+      ->display_manager()
+      ->layout_store()
+      ->SetDefaultDisplayLayout(DisplayLayout());
 #endif
 }