Multiple dispatchers for root windows

ui/aura/root_window_host_linux.cc

Index: ui/aura/root_window_host_linux.cc
diff --git a/ui/aura/root_window_host_linux.cc b/ui/aura/root_window_host_linux.cc
index 9cbefff8c41d6f7d3bd44ec952080321e3a7de3b..1691043791d372f69af0cf6493c38695ec39fe1f 100644
--- a/ui/aura/root_window_host_linux.cc
+++ b/ui/aura/root_window_host_linux.cc
@@ -407,7 +407,7 @@ RootWindowHostLinux::RootWindowHostLinux(const gfx::Rect& bounds)
       CWBackPixmap,
       &swa);
   static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
-      WindowDispatcherCreated(xwindow_, this);
+      AddDispatcherForWindow(this, xwindow_);
 
   prop_.reset(new ui::ViewProp(xwindow_, kRootWindowHostLinuxKey, this));
 
@@ -470,7 +470,7 @@ RootWindowHostLinux::RootWindowHostLinux(const gfx::Rect& bounds)
 
 RootWindowHostLinux::~RootWindowHostLinux() {
   static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
-      WindowDispatcherDestroying(xwindow_);
+      RemoveDispatcherForWindow(xwindow_);
 
   UnConfineCursor();