Listen to Display reconfiguration and notify DisplayObservers on Mac.

ui/views/widget/desktop_aura/desktop_screen_x11.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 "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xlib.h>
 
 // It clashes with out RootWindow.
 #undef RootWindow
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/layout.h"
 #include "ui/display/util/display_util.h"
 #include "ui/display/util/x11/edid_parser_x11.h"
 #include "ui/events/platform/platform_event_source.h"
 #include "ui/gfx/display.h"
-#include "ui/gfx/display_observer.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/widget/desktop_aura/desktop_screen.h"
 #include "ui/views/widget/desktop_aura/desktop_window_tree_host_x11.h"
 #include "ui/views/widget/desktop_aura/x11_topmost_window_finder.h"
 
 namespace {
 
 // The delay to perform configuration after RRNotify.  See the comment
@@ skipping 69 matching lines @@
   } else {
     displays_ = GetFallbackDisplayList();
   }
 }
 
 DesktopScreenX11::~DesktopScreenX11() {
   if (has_xrandr_ && ui::PlatformEventSource::GetInstance())
     ui::PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
 }
 
-void DesktopScreenX11::ProcessDisplayChange(
-    const std::vector<gfx::Display>& incoming) {
-  std::vector<gfx::Display> old_displays = displays_;
-  displays_ = incoming;
-
-  typedef std::vector<gfx::Display>::const_iterator DisplayIt;
-  std::vector<gfx::Display>::const_iterator old_it = old_displays.begin();
-  for (; old_it != old_displays.end(); ++old_it) {
-    bool found = false;
-    for (std::vector<gfx::Display>::const_iterator new_it =
-             displays_.begin(); new_it != displays_.end(); ++new_it) {
-      if (old_it->id() == new_it->id()) {
-        found = true;
-        break;
-      }
-    }
-
-    if (!found) {
-      FOR_EACH_OBSERVER(gfx::DisplayObserver, observer_list_,
-                        OnDisplayRemoved(*old_it));
-    }
-  }
-
-  std::vector<gfx::Display>::const_iterator new_it = displays_.begin();
-  for (; new_it != displays_.end(); ++new_it) {
-    bool found = false;
-    for (std::vector<gfx::Display>::const_iterator old_it =
-         old_displays.begin(); old_it != old_displays.end(); ++old_it) {
-      if (new_it->id() != old_it->id())
-        continue;
-
-      uint32_t metrics = gfx::DisplayObserver::DISPLAY_METRIC_NONE;
-
-      if (new_it->bounds() != old_it->bounds())
-        metrics |= gfx::DisplayObserver::DISPLAY_METRIC_BOUNDS;
-
-      if (new_it->rotation() != old_it->rotation())
-        metrics |= gfx::DisplayObserver::DISPLAY_METRIC_ROTATION;
-
-      if (new_it->work_area() != old_it->work_area())
-        metrics |= gfx::DisplayObserver::DISPLAY_METRIC_WORK_AREA;
-
-      if (new_it->device_scale_factor() != old_it->device_scale_factor())
-        metrics |= gfx::DisplayObserver::DISPLAY_METRIC_DEVICE_SCALE_FACTOR;
-
-      if (metrics != gfx::DisplayObserver::DISPLAY_METRIC_NONE) {
-        FOR_EACH_OBSERVER(gfx::DisplayObserver,
-                          observer_list_,
-                          OnDisplayMetricsChanged(*new_it, metrics));
-      }
-
-      found = true;
-      break;
-    }
-
-    if (!found) {
-      FOR_EACH_OBSERVER(gfx::DisplayObserver, observer_list_,
-                        OnDisplayAdded(*new_it));
-    }
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // DesktopScreenX11, gfx::Screen implementation:
 
 bool DesktopScreenX11::IsDIPEnabled() {
   return true;
 }
 
 gfx::Point DesktopScreenX11::GetCursorScreenPoint() {
   TRACE_EVENT0("views", "DesktopScreenX11::GetCursorScreenPoint()");
 
@@ skipping 81 matching lines @@
   }
   // Fallback to the primary display if there is no matching display.
   return matching ? *matching : GetPrimaryDisplay();
 }
 
 gfx::Display DesktopScreenX11::GetPrimaryDisplay() const {
   return displays_.front();
 }
 
 void DesktopScreenX11::AddObserver(gfx::DisplayObserver* observer) {
-  observer_list_.AddObserver(observer);
+  observer_delegate_.AddObserver(observer);
 }
 
 void DesktopScreenX11::RemoveObserver(gfx::DisplayObserver* observer) {
-  observer_list_.RemoveObserver(observer);
+  observer_delegate_.RemoveObserver(observer);
 }
 
 bool DesktopScreenX11::CanDispatchEvent(const ui::PlatformEvent& event) {
   return event->type - xrandr_event_base_ == RRScreenChangeNotify ||
          event->type - xrandr_event_base_ == RRNotify;
 }
 
 uint32_t DesktopScreenX11::DispatchEvent(const ui::PlatformEvent& event) {
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
     // Pass the event through to xlib.
@@ skipping 118 matching lines @@
 
   XRRFreeScreenResources(resources);
 
   if (displays.empty())
     return GetFallbackDisplayList();
 
   return displays;
 }
 
 void DesktopScreenX11::ConfigureTimerFired() {
-  std::vector<gfx::Display> new_displays = BuildDisplaysFromXRandRInfo();
-  ProcessDisplayChange(new_displays);
+  std::vector<gfx::Display> old_displays = displays_;
+  displays_ = BuildDisplaysFromXRandRInfo();
+
+  observer_delegate_.NotifyDisplaysChanged(old_displays, displays_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 gfx::Screen* CreateDesktopScreen() {
   return new DesktopScreenX11;
 }
 
 }  // namespace views