Multiple dispatchers for root windows

ui/aura/monitor_change_observer_x11.cc

Index: ui/aura/monitor_change_observer_x11.cc
diff --git a/ui/aura/monitor_change_observer_x11.cc b/ui/aura/monitor_change_observer_x11.cc
index 59a0ebe51bd2a0a57264aef05f85d7280d091a81..7673f812cba02236eea453a90491ec5122750be7 100644
--- a/ui/aura/monitor_change_observer_x11.cc
+++ b/ui/aura/monitor_change_observer_x11.cc
@@ -52,15 +52,13 @@ MonitorChangeObserverX11::MonitorChangeObserverX11()
   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) {