Listen to Display reconfiguration and notify DisplayObservers on Mac.

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

 // Copyright (c) 2013 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 "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/event_generator.h"
@@ skipping 61 matching lines @@
     ViewsTestBase::TearDown();
   }
 
  protected:
   std::vector<gfx::Display> changed_display_;
   std::vector<gfx::Display> added_display_;
   std::vector<gfx::Display> removed_display_;
 
   DesktopScreenX11* screen() { return screen_.get(); }
 
+  void NotifyDisplaysChanged(const std::vector<gfx::Display>& displays) {
+    DesktopScreenX11* screen = screen_.get();
+    screen->change_notifier_.NotifyDisplaysChanged(screen->displays_, displays);
+    screen->displays_ = displays;
+  }
+
   void ResetDisplayChanges() {
     changed_display_.clear();
     added_display_.clear();
     removed_display_.clear();
   }
 
   Widget* BuildTopLevelDesktopWidget(const gfx::Rect& bounds,
       bool use_test_native_widget) {
     Widget* toplevel = new Widget;
     Widget::InitParams toplevel_params =
@@ skipping 27 matching lines @@
   }
 
   scoped_ptr<DesktopScreenX11> screen_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11Test);
 };
 
 TEST_F(DesktopScreenX11Test, BoundsChangeSingleMonitor) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(1u, changed_display_.size());
   EXPECT_EQ(0u, added_display_.size());
   EXPECT_EQ(0u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, AddMonitorToTheRight) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(0u, changed_display_.size());
   EXPECT_EQ(1u, added_display_.size());
   EXPECT_EQ(0u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, AddMonitorToTheLeft) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 1024, 768)));
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(1024, 0, 640, 480)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(1u, changed_display_.size());
   EXPECT_EQ(1u, added_display_.size());
   EXPECT_EQ(0u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, RemoveMonitorOnRight) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   ResetDisplayChanges();
 
   displays.clear();
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(0u, changed_display_.size());
   EXPECT_EQ(0u, added_display_.size());
   EXPECT_EQ(1u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, RemoveMonitorOnLeft) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   ResetDisplayChanges();
 
   displays.clear();
   displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(1u, changed_display_.size());
   EXPECT_EQ(0u, added_display_.size());
   EXPECT_EQ(1u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, GetDisplayNearestPoint) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(kSecondDisplay,
             screen()->GetDisplayNearestPoint(gfx::Point(650, 10)).id());
   EXPECT_EQ(kFirstDisplay,
             screen()->GetDisplayNearestPoint(gfx::Point(10, 10)).id());
   EXPECT_EQ(kFirstDisplay,
             screen()->GetDisplayNearestPoint(gfx::Point(10000, 10000)).id());
 }
 
 TEST_F(DesktopScreenX11Test, GetDisplayMatchingBasic) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(kSecondDisplay,
             screen()->GetDisplayMatching(gfx::Rect(700, 20, 100, 100)).id());
 }
 
 TEST_F(DesktopScreenX11Test, GetDisplayMatchingOverlap) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   EXPECT_EQ(kSecondDisplay,
             screen()->GetDisplayMatching(gfx::Rect(630, 20, 100, 100)).id());
 }
 
 TEST_F(DesktopScreenX11Test, GetPrimaryDisplay) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
   displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 640, 480)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   // The first display in the list is always the primary, even if other
   // displays are to the left in screen layout.
   EXPECT_EQ(kFirstDisplay, screen()->GetPrimaryDisplay().id());
 }
 
 TEST_F(DesktopScreenX11Test, GetDisplayNearestWindow) {
   // Set up a two monitor situation.
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
 
   Widget* window_one = BuildTopLevelDesktopWidget(gfx::Rect(10, 10, 10, 10),
       false);
   Widget* window_two = BuildTopLevelDesktopWidget(gfx::Rect(650, 50, 10, 10),
       false);
 
   EXPECT_EQ(
       kFirstDisplay,
       screen()->GetDisplayNearestWindow(window_one->GetNativeWindow()).id());
   EXPECT_EQ(
@@ skipping 89 matching lines @@
 
   widget->CloseNow();
 }
 
 // Test that rotating the displays notifies the DisplayObservers.
 TEST_F(DesktopScreenX11Test, RotationChange) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(
       gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   ResetDisplayChanges();
 
   displays[0].set_rotation(gfx::Display::ROTATE_90);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(1u, changed_display_.size());
 
   displays[1].set_rotation(gfx::Display::ROTATE_90);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_rotation(gfx::Display::ROTATE_270);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(3u, changed_display_.size());
 
   displays[0].set_rotation(gfx::Display::ROTATE_270);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(3u, changed_display_.size());
 
   displays[0].set_rotation(gfx::Display::ROTATE_0);
   displays[1].set_rotation(gfx::Display::ROTATE_0);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(5u, changed_display_.size());
 }
 
 // Test that changing the displays workarea notifies the DisplayObservers.
 TEST_F(DesktopScreenX11Test, WorkareaChange) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(
       gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   ResetDisplayChanges();
 
   displays[0].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(1u, changed_display_.size());
 
   displays[1].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[1].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_work_area(gfx::Rect(0, 0, 640, 480));
   displays[1].set_work_area(gfx::Rect(640, 0, 1024, 768));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(4u, changed_display_.size());
 }
 
 // Test that changing the device scale factor notifies the DisplayObservers.
 TEST_F(DesktopScreenX11Test, DeviceScaleFactorChange) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(
       gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   ResetDisplayChanges();
 
   displays[0].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(1u, changed_display_.size());
 
   displays[1].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[1].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(2u, changed_display_.size());
 
   displays[0].set_device_scale_factor(1.f);
   displays[1].set_device_scale_factor(1.f);
-  screen()->ProcessDisplayChange(displays);
+  NotifyDisplaysChanged(displays);
   EXPECT_EQ(4u, changed_display_.size());
 }
 
 }  // namespace views