Multiple dispatchers for root windows

ui/aura/dispatcher_linux.h

 // 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.
 
 #ifndef UI_AURA_DISPATCHER_LINUX_H_
 #define UI_AURA_DISPATCHER_LINUX_H_
 #pragma once
 
 #include <map>
+#include <vector>
 #include <X11/Xlib.h>
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
 #undef RootWindow
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 
 namespace aura {
 
 class DispatcherLinux : public MessageLoop::Dispatcher,
                         public base::MessagePumpObserver {
  public:
   DispatcherLinux();
   virtual ~DispatcherLinux();
 
-  void WindowDispatcherCreated(::Window window,
-                               MessageLoop::Dispatcher* dispatcher);
-  void WindowDispatcherDestroying(::Window window);
+  // Registers/Unregisters |dispatcher| for the |x_window|.
+  void RegisterDispatcherForWindow(MessageLoop::Dispatcher* dispatcher,

[Ben Goodger (Google), 2012/05/22 23:44:40]

AddDispatcher

[oshima, 2012/05/23 00:31:06]

Done.

+                                   ::Window x_window);
+  void UnregisterDispatcherForWindow(::Window x_window);

[Ben Goodger (Google), 2012/05/22 23:44:40]

RemoveDispatcher

[oshima, 2012/05/23 00:31:06]

Done.

+
+  // Registers/Unregisters |dispatcher| to receive all events sent to the X
+  // root wnidow.

[Ben Goodger (Google), 2012/05/22 23:44:40]

window.

[oshima, 2012/05/23 00:31:06]

Done.

+  void RegisterDispatcherForRootWindow(MessageLoop::Dispatcher* dispatcher);
+  void UnregisterDispatcherForRootWindow(MessageLoop::Dispatcher* dispatcher);

[Ben Goodger (Google), 2012/05/22 23:44:40]

etc

[oshima, 2012/05/23 00:31:06]

Done.

 
   // Overridden from MessageLoop::Dispatcher:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
   // Overridden from base::MessagePumpObserver:
   virtual base::EventStatus WillProcessEvent(
       const base::NativeEvent& event) OVERRIDE;
   virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
 
  private:
   typedef std::map< ::Window, MessageLoop::Dispatcher* > DispatchersMap;
+  typedef std::vector<MessageLoop::Dispatcher*> Dispatchers;
 
   MessageLoop::Dispatcher* GetDispatcherForXEvent(XEvent* xev) const;
 
   DispatchersMap dispatchers_;
+  Dispatchers root_window_dispatchers_;
+
+  ::Window x_root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(DispatcherLinux);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_DISPATCHER_LINUX_H_