Allow switching between extended and unified

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/ash_switches.h"
 #include "ash/display/display_controller.h"
 #include "ash/display/display_info.h"
 #include "ash/display/display_layout_store.h"
@@ skipping 105 matching lines @@
   }
   void OnDisplayAdded(const gfx::Display& new_display) override {
     added_.push_back(new_display);
   }
   void OnDisplayRemoved(const gfx::Display& old_display) override {
     ++removed_count_;
   }
 
   // aura::WindowObserver overrides:
   void OnWindowDestroying(aura::Window* window) override {
-    // TODO(oshima): When moving between unified desktop, the
-    // primary root window can be deleted.
-    if (!display_manager()->IsInUnifiedMode()) {
-      ASSERT_EQ(Shell::GetPrimaryRootWindow(), window);
-      root_window_destroyed_ = true;
-    }
+    ASSERT_EQ(Shell::GetPrimaryRootWindow(), window);
+    root_window_destroyed_ = true;
   }
 
  private:
   vector<gfx::Display> changed_;
   vector<gfx::Display> added_;
   size_t removed_count_;
   bool root_window_destroyed_;
   uint32_t changed_metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManagerTest);
@@ skipping 1318 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;
+  // Don't check root window destruction in unified mode.
+  Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
+  UpdateDisplay("300x200,400x500");
+
+  // Switch to unified desktop.
   display_manager()->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
-  display_manager()->SetMultiDisplayMode(DisplayManager::UNIFIED);
-  UpdateDisplay("300x200,400x500");
+  display_manager()->ReconfigureDisplays();
 
   gfx::Screen* screen =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
   EXPECT_EQ("700x500", screen->GetPrimaryDisplay().size().ToString());
 
   display_manager()->SetMirrorMode(true);
   EXPECT_EQ("300x200", screen->GetPrimaryDisplay().size().ToString());
 
   display_manager()->SetMirrorMode(false);
   EXPECT_EQ("700x500", screen->GetPrimaryDisplay().size().ToString());
 
-  // Swithc to single desktop.
+  // Switch to single desktop.
   UpdateDisplay("500x300");
   EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString());
 
-  // Swithc to unified desktop.
+  // Switch to unified desktop.
   UpdateDisplay("500x300,400x500");
   EXPECT_EQ("900x500", screen->GetPrimaryDisplay().size().ToString());
+
+  // Switch back to extended desktop.
+  display_manager()->SetDefaultMultiDisplayMode(DisplayManager::EXTENDED);
+  display_manager()->ReconfigureDisplays();
+  EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ("400x500", ScreenUtil::GetSecondaryDisplay().size().ToString());
 }
 
 TEST_F(DisplayManagerTest, RotateUnifiedDesktop) {
   if (!SupportsMultipleDisplays())
     return;
+  // 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 =
       gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_ALTERNATE);
   const gfx::Display& display = screen->GetPrimaryDisplay();
   EXPECT_EQ("700x500", display.size().ToString());
   display_manager()->SetDisplayRotation(display.id(), gfx::Display::ROTATE_90,
                                         gfx::Display::ROTATION_SOURCE_ACTIVE);
   EXPECT_EQ("500x700", screen->GetPrimaryDisplay().size().ToString());
   display_manager()->SetDisplayRotation(display.id(), gfx::Display::ROTATE_0,
                                         gfx::Display::ROTATION_SOURCE_ACTIVE);
   EXPECT_EQ("700x500", screen->GetPrimaryDisplay().size().ToString());
 
   UpdateDisplay("300x200");
   EXPECT_EQ("300x200", screen->GetPrimaryDisplay().size().ToString());
 }
 
 // Makes sure the transition from unified to single won't crash
 // with docked wnidows.
 TEST_F(DisplayManagerTest, UnifiedWithDockWindows) {
   if (!SupportsMultipleDisplays())
     return;
+  // 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(
       CreateTestWindowInShellWithBounds(gfx::Rect(10, 10, 50, 50)));
   docked->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_DOCKED);
   ASSERT_TRUE(wm::GetWindowState(docked.get())->IsDocked());
   EXPECT_EQ("0,0 250x453", docked->bounds().ToString());
@@ skipping 157 matching lines @@
       1.25f, Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_TRUE(IsTextSubpixelPositioningEnabled());
   EXPECT_EQ(gfx::FontRenderParams::HINTING_NONE, GetFontHintingParams());
 
   DisplayInfo::SetUse125DSFForUIScaling(false);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash