Notify primary display reassignment

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 1363 matching lines @@
             DisplayLayout(DisplayLayout::TOP, -70).Invert().ToString());
 
   EXPECT_EQ("top, 0",
             DisplayLayout(DisplayLayout::BOTTOM, 0).Invert().ToString());
   EXPECT_EQ("top, -70",
             DisplayLayout(DisplayLayout::BOTTOM, 70).Invert().ToString());
   EXPECT_EQ("top, 80",
             DisplayLayout(DisplayLayout::BOTTOM, -80).Invert().ToString());
 }
 
+TEST_F(DisplayManagerTest, NotifyPrimaryChange) {
+  if (!SupportsMultipleDisplays())
+    return;
+  UpdateDisplay("500x500,500x500");
+  ash::Shell::GetInstance()->display_controller()->SwapPrimaryDisplay();
+  reset();
+  UpdateDisplay("500x500");
+  EXPECT_FALSE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
+  EXPECT_FALSE(changed_metrics() &
+               gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+  EXPECT_TRUE(changed_metrics() &
+              gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY);
+
+  UpdateDisplay("500x500,500x500");
+  ash::Shell::GetInstance()->display_controller()->SwapPrimaryDisplay();
+  reset();
+  UpdateDisplay("500x400");
+  EXPECT_TRUE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
+  EXPECT_TRUE(changed_metrics() &
+              gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+  EXPECT_TRUE(changed_metrics() &
+              gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY);
+}
+
+TEST_F(DisplayManagerTest, NotifyPrimaryChangeUndock) {
+  if (!SupportsMultipleDisplays())
+    return;
+  // Assume the default display is an external display, and
+  // emulates undocking by switching to another display.
+  DisplayInfo another_display_info =
+      CreateDisplayInfo(1, gfx::Rect(0, 0, 1280, 800));
+  std::vector<DisplayInfo> info_list;
+  info_list.push_back(another_display_info);
+  reset();
+  display_manager()->OnNativeDisplaysChanged(info_list);
+  EXPECT_TRUE(changed_metrics() & gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS);
+  EXPECT_TRUE(changed_metrics() &
+              gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA);
+  EXPECT_TRUE(changed_metrics() &
+              gfx::DisplayObserver::DISPLAY_METRIC_PRIMARY);
+}
+
 #if defined(OS_WIN)
 // TODO(scottmg): RootWindow doesn't get resized on Windows
 // Ash. http://crbug.com/247916.
 #define MAYBE_UpdateDisplayWithHostOrigin DISABLED_UpdateDisplayWithHostOrigin
 #else
 #define MAYBE_UpdateDisplayWithHostOrigin UpdateDisplayWithHostOrigin
 #endif
 
 TEST_F(DisplayManagerTest, MAYBE_UpdateDisplayWithHostOrigin) {
   UpdateDisplay("100x200,300x400");
@@ skipping 160 matching lines @@
   FontTestHelper helper(1.25f, FontTestHelper::INTERNAL);
   ASSERT_DOUBLE_EQ(
       1.0f, Shell::GetScreen()->GetPrimaryDisplay().device_scale_factor());
   EXPECT_FALSE(IsTextSubpixelPositioningEnabled());
   DisplayInfo::SetUse125DSFForUIScaling(false);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace ash