Allow unified desktop for 3+ displays

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_builder.h"
@@ skipping 1682 matching lines @@
 
   UpdateDisplay("400x500,300x200");
 
   // Enable after extended mode.
   display_manager()->SetUnifiedDesktopEnabled(true);
 
   // Defaults to the unified desktop.
   gfx::Screen* screen = gfx::Screen::GetScreen();
   // 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());
+  EXPECT_EQ(gfx::Size(1150, 500), screen->GetPrimaryDisplay().size());
 
   display_manager()->SetMirrorMode(true);
-  EXPECT_EQ("400x500", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ(gfx::Size(400, 500), screen->GetPrimaryDisplay().size());
 
   display_manager()->SetMirrorMode(false);
-  EXPECT_EQ("1150x500", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ(gfx::Size(1150, 500), screen->GetPrimaryDisplay().size());
 
   // Switch to single desktop.
   UpdateDisplay("500x300");
-  EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ(gfx::Size(500, 300), screen->GetPrimaryDisplay().size());
 
   // Switch to unified desktop.
   UpdateDisplay("500x300,400x500");
   // 400 * 300 / 500 + 500 ~= 739.
-  EXPECT_EQ("739x300", screen->GetPrimaryDisplay().size().ToString());
+  EXPECT_EQ(gfx::Size(739, 300), screen->GetPrimaryDisplay().size());
 
   // The default should fit to the internal display.
   std::vector<DisplayInfo> display_info_list;
   display_info_list.push_back(CreateDisplayInfo(10, gfx::Rect(0, 0, 500, 300)));
   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());
+    EXPECT_EQ(gfx::Size(1233, 500), screen->GetPrimaryDisplay().size());
   }
 
+  // Switch to 3 displays.
+  UpdateDisplay("500x300,400x500,500x300");
+  EXPECT_EQ(gfx::Size(1239, 300), screen->GetPrimaryDisplay().size());
+
   // Switch back to extended desktop.
   display_manager()->SetUnifiedDesktopEnabled(false);
-  EXPECT_EQ("500x300", screen->GetPrimaryDisplay().size().ToString());
-  EXPECT_EQ("400x500", ScreenUtil::GetSecondaryDisplay().size().ToString());
+  EXPECT_EQ(gfx::Size(500, 300), screen->GetPrimaryDisplay().size());
+  EXPECT_EQ(gfx::Size(400, 500), ScreenUtil::GetSecondaryDisplay().size());
+  EXPECT_EQ(gfx::Size(500, 300),
+            display_manager()
+                ->GetDisplayForId(ScreenUtil::GetSecondaryDisplay().id() + 1)
+                .size());
 }
 
 TEST_F(DisplayManagerTest, UnifiedDesktopWithHardwareMirroring) {
   if (!SupportsMultipleDisplays())
     return;
   // Don't check root window destruction in unified mode.
   Shell::GetPrimaryRootWindow()->RemoveObserver(this);
 
   // Enter to hardware mirroring.
   DisplayInfo d1(1, "", false);
@@ skipping 477 matching lines @@
   layout_store->RegisterLayoutForDisplayIdList(list, std::move(old_layout));
   const DisplayLayout& stored = layout_store->GetRegisteredDisplayLayout(list);
 
   EXPECT_EQ(id1, stored.placement_list[0].parent_display_id);
   EXPECT_EQ(id2, stored.placement_list[0].display_id);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash