Multiple dispatchers for root windows

ui/aura/monitor_change_observer_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/aura/monitor_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 34 matching lines @@
 
 }  // namespace
 
 MonitorChangeObserverX11::MonitorChangeObserverX11()
     : xdisplay_(base::MessagePumpX::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       xrandr_event_base_(0) {
   XRRSelectInput(xdisplay_, x_root_window_, RRScreenChangeNotifyMask);
   int error_base_ignored;
   XRRQueryExtension(xdisplay_, &xrandr_event_base_, &error_base_ignored);
-  static_cast<DispatcherLinux*>(
-      Env::GetInstance()->GetDispatcher())->
-      WindowDispatcherCreated(x_root_window_, this);
+  static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
+      AddDispatcherForRootWindow(this);
 }
 
 MonitorChangeObserverX11::~MonitorChangeObserverX11() {
-  static_cast<DispatcherLinux*>(
-      Env::GetInstance()->GetDispatcher())->
-      WindowDispatcherDestroying(x_root_window_);
+  static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
+      RemoveDispatcherForRootWindow(this);
 }
 
 bool MonitorChangeObserverX11::Dispatch(const base::NativeEvent& event) {
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
     NotifyMonitorChange();
   }
   return true;
 }
 
 void MonitorChangeObserverX11::NotifyMonitorChange() {
@@ skipping 63 matching lines @@
   for (std::vector<gfx::Monitor>::iterator iter = monitors.begin();
        iter != monitors.end(); ++iter, ++id)
     (*iter).set_id(id);
 
   Env::GetInstance()->monitor_manager()
       ->OnNativeMonitorsChanged(monitors);
 }
 
 }  // namespace internal
 }  // namespace aura