Allow dynamic enabling/disabling of unified desktop

ash/display/display_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/display/display_manager.h"
 
 #include "ash/accelerators/accelerator_commands.h"
 #include "ash/ash_switches.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
@@ skipping 640 matching lines @@
 
   UpdateDisplay("100+0-500x500,0+501-400x400");
 
   const int64 primary_id = WindowTreeHostManager::GetPrimaryDisplayId();
   const int64 secondary_id = ScreenUtil::GetSecondaryDisplay().id();
 
   DisplayInfo primary_info = display_manager()->GetDisplayInfo(primary_id);
   DisplayInfo secondary_info = display_manager()->GetDisplayInfo(secondary_id);
 
   // An id which is different from primary and secondary.
-  const int64 third_id = primary_id + secondary_id;
+  const int64 third_id = secondary_id + 1;
 
   DisplayInfo third_info =
       CreateDisplayInfo(third_id, gfx::Rect(0, 0, 600, 600));
 
   std::vector<DisplayInfo> display_info_list;
   display_info_list.push_back(third_info);
   display_info_list.push_back(secondary_info);
   display_manager()->OnNativeDisplaysChanged(display_info_list);
 
   // Secondary seconary_id becomes the primary as it has smaller output index.
@@ skipping 441 matching lines @@
 
   SetDisplayUIScale(display_id, 1.25f);
   EXPECT_EQ(1.0f, GetDisplayInfoAt(0).GetEffectiveDeviceScaleFactor());
   EXPECT_EQ(1.25f, GetDisplayInfoAt(0).GetEffectiveUIScale());
   EXPECT_EQ("2400x1350", GetDisplayForId(display_id).size().ToString());
 }
 
 TEST_F(DisplayManagerTest, ResolutionChangeInUnifiedMode) {
   if (!SupportsMultipleDisplays())
     return;
-
-  test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
-
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
+  display_manager->SetUnifiedDesktopEnabled(true);
 
   UpdateDisplay("200x200, 400x400");
 
   int64 unified_id = Shell::GetScreen()->GetPrimaryDisplay().id();
   DisplayInfo info = display_manager->GetDisplayInfo(unified_id);
   ASSERT_EQ(2u, info.display_modes().size());
   EXPECT_EQ("400x200", info.display_modes()[0].size.ToString());
   EXPECT_TRUE(info.display_modes()[0].native);
   EXPECT_EQ("800x400", info.display_modes()[1].size.ToString());
   EXPECT_FALSE(info.display_modes()[1].native);
@@ skipping 373 matching lines @@
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ("100,200", host0->GetBounds().origin().ToString());
   EXPECT_EQ("100x200", host0->GetBounds().size().ToString());
   EXPECT_EQ("300,500", host1->GetBounds().origin().ToString());
   EXPECT_EQ("200x300", host1->GetBounds().size().ToString());
 }
 
 TEST_F(DisplayManagerTest, UnifiedDesktopBasic) {
   if (!SupportsMultipleDisplays())
     return;
-  test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
 
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
   UpdateDisplay("400x500,300x200");
 
+  // Enable after extended mode.
+  display_manager()->SetUnifiedDesktopEnabled(true);
+
   // Defaults to the unified desktop.
   gfx::Screen* screen =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
   // The 2nd display is scaled so that it has the same height as 1st display.
   // 300 * 500 / 200  + 400 = 1150.
   EXPECT_EQ("1150x500", screen->GetPrimaryDisplay().size().ToString());
 
   display_manager()->SetMirrorMode(true);
   EXPECT_EQ("400x500", screen->GetPrimaryDisplay().size().ToString());
 
@@ skipping 15 matching lines @@
   display_info_list.push_back(
       CreateDisplayInfo(11, gfx::Rect(500, 0, 400, 500)));
   {
     test::ScopedSetInternalDisplayId set_internal(11);
     display_manager()->OnNativeDisplaysChanged(display_info_list);
     // 500 * 500 / 300 + 400 ~= 1233.
     EXPECT_EQ("1233x500", screen->GetPrimaryDisplay().size().ToString());
   }
 
   // Switch back to extended desktop.
-  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::EXTENDED);
-  display_manager()->ReconfigureDisplays();
+  display_manager()->SetUnifiedDesktopEnabled(false);
   EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString());
   EXPECT_EQ("400x500", ScreenUtil::GetSecondaryDisplay().size().ToString());
 }
 
+TEST_F(DisplayManagerTest, UnifiedDesktopEnabledWithExtended) {
+  if (!SupportsMultipleDisplays())
+    return;
+  // Don't check root window destruction in unified mode.
+  Shell::GetPrimaryRootWindow()->RemoveObserver(this);
+
+  UpdateDisplay("400x500,300x200");
+  DisplayIdPair pair = display_manager()->GetCurrentDisplayIdPair();
+  DisplayLayout layout =
+      display_manager()->layout_store()->GetRegisteredDisplayLayout(pair);
+  layout.default_unified = false;
+  display_manager()->layout_store()->RegisterLayoutForDisplayIdPair(
+      pair.first, pair.second, layout);
+  display_manager()->SetUnifiedDesktopEnabled(true);
+  EXPECT_FALSE(display_manager()->IsInUnifiedMode());
+}
+
 TEST_F(DisplayManagerTest, UnifiedDesktopWith2xDSF) {
   if (!SupportsMultipleDisplays())
     return;
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
-  test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
+  display_manager()->SetUnifiedDesktopEnabled(true);
   gfx::Screen* screen =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
 
   // 2nd display is 2x.
   UpdateDisplay("400x500,1000x800*2");
   DisplayInfo info =
       display_manager()->GetDisplayInfo(screen->GetPrimaryDisplay().id());
   EXPECT_EQ(2u, info.display_modes().size());
   EXPECT_EQ("1640x800", info.display_modes()[0].size.ToString());
   EXPECT_EQ(2.0f, info.display_modes()[0].device_scale_factor);
@@ skipping 95 matching lines @@
   // Mirror windows are created in a posted task.
   RunAllPendingInMessageLoop();
 
   UpdateDisplay("300x250,400x550");
   RunAllPendingInMessageLoop();
 }
 
 TEST_F(DisplayManagerTest, NoRotateUnifiedDesktop) {
   if (!SupportsMultipleDisplays())
     return;
-  test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
+  display_manager()->SetUnifiedDesktopEnabled(true);
 
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
   UpdateDisplay("400x500,300x200");
 
   gfx::Screen* screen =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
   const gfx::Display& display = screen->GetPrimaryDisplay();
   EXPECT_EQ("1150x500", display.size().ToString());
   display_manager()->SetDisplayRotation(display.id(), gfx::Display::ROTATE_90,
                                         gfx::Display::ROTATION_SOURCE_ACTIVE);
   EXPECT_EQ("1150x500", screen->GetPrimaryDisplay().size().ToString());
   display_manager()->SetDisplayRotation(display.id(), gfx::Display::ROTATE_0,
                                         gfx::Display::ROTATION_SOURCE_ACTIVE);
   EXPECT_EQ("1150x500", screen->GetPrimaryDisplay().size().ToString());
 
   UpdateDisplay("400x500");
   EXPECT_EQ("400x500", screen->GetPrimaryDisplay().size().ToString());
 }
 
 // Makes sure the transition from unified to single won't crash
 // with docked windows.
 TEST_F(DisplayManagerTest, UnifiedWithDockWindows) {
   if (!SupportsMultipleDisplays())
     return;
-  test::DisplayManagerTestApi::EnableUnifiedDesktopForTest();
+  display_manager()->SetUnifiedDesktopEnabled(true);
 
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
   UpdateDisplay("400x500,300x200");
 
   scoped_ptr<aura::Window> docked(
       CreateTestWindowInShellWithBounds(gfx::Rect(10, 10, 50, 50)));
   docked->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DOCKED);
   ASSERT_TRUE(wm::GetWindowState(docked.get())->IsDocked());
@@ skipping 169 matching lines @@
 
   EXPECT_EQ(gfx::Display::ROTATE_90,
             info.GetRotation(gfx::Display::ROTATION_SOURCE_USER));
   EXPECT_EQ(gfx::Display::ROTATE_90,
             info.GetRotation(gfx::Display::ROTATION_SOURCE_ACTIVE));
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash