Merge aura::DispatcherLinux into base::MessagePumpAuraX11.

ui/aura/env.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/env.h"
 
 #include "base/command_line.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 
 #if defined(USE_X11)
+#include "base/message_pump_aurax11.h"
 #include "ui/aura/display_change_observer_x11.h"
 #endif
 
 namespace aura {
 
 // static
 Env* Env::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, public:
 
 Env::Env()
     : mouse_button_flags_(0),
       is_cursor_hidden_(false),
       is_touch_down_(false),
       render_white_bg_(true),
       stacking_client_(NULL) {
 }
 
 Env::~Env() {
+#if defined(USE_X11)
+  base::MessagePumpAuraX11::Current()->RemoveObserver(
+      &device_list_updater_aurax11_);
+#endif
+
   ui::Compositor::Terminate();
 }
 
 // static
 Env* Env::GetInstance() {
   if (!instance_) {
     instance_ = new Env;
     instance_->Init();
   }
   return instance_;
@@ skipping 42 matching lines @@
   display_change_observer_->NotifyDisplayChange();
 #endif
 }
 
 void Env::SetEventFilter(EventFilter* event_filter) {
   event_filter_.reset(event_filter);
 }
 
 #if !defined(OS_MACOSX)
 MessageLoop::Dispatcher* Env::GetDispatcher() {
+#if defined(USE_X11)
+  return base::MessagePumpAuraX11::Current();
+#else
   return dispatcher_.get();
+#endif
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
 void Env::Init() {
-#if !defined(OS_MACOSX)
+#if defined(OS_WIN)
   dispatcher_.reset(CreateDispatcher());
 #endif
 #if defined(USE_X11)
   display_change_observer_.reset(new internal::DisplayChangeObserverX11);
+
+  // We can't do this with a root window listener because XI_HierarchyChanged
+  // messages don't have a target window.
+  base::MessagePumpAuraX11::Current()->AddObserver(
+      &device_list_updater_aurax11_);
 #endif
   ui::Compositor::Initialize(
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUIEnableThreadedCompositing));
 }
 
 void Env::NotifyWindowInitialized(Window* window) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
 }
 
 }  // namespace aura