Merge aura::DispatcherLinux into base::MessagePumpAuraX11.

ui/views/widget/x11_desktop_handler.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/views/widget/x11_desktop_handler.h"
 
 #include "base/message_loop.h"
 #include "ui/aura/desktop/desktop_activation_client.h"
-#include "ui/aura/dispatcher_linux.h"
 #include "ui/aura/env.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
 
 namespace {
 
 const char* kAtomsToCache[] = {
   "_NET_ACTIVE_WINDOW",
@@ skipping 15 matching lines @@
   return g_handler;
 }
 
 X11DesktopHandler::X11DesktopHandler()
     : xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       atom_cache_(xdisplay_, kAtomsToCache),
       focus_manager_(new aura::FocusManager),
       desktop_activation_client_(
           new aura::DesktopActivationClient(focus_manager_.get())) {
-  static_cast<aura::DispatcherLinux*>(
-      aura::Env::GetInstance()->GetDispatcher())->
-      AddDispatcherForRootWindow(this);
+  base::MessagePumpAuraX11::Current()->AddDispatcherForRootWindow(this);
   aura::Env::GetInstance()->AddObserver(this);
 
   XWindowAttributes attr;
   XGetWindowAttributes(xdisplay_, x_root_window_, &attr);
   XSelectInput(xdisplay_, x_root_window_,
                attr.your_event_mask | PropertyChangeMask |
                StructureNotifyMask | SubstructureNotifyMask);
 }
 
 X11DesktopHandler::~X11DesktopHandler() {
   aura::Env::GetInstance()->RemoveObserver(this);
-  static_cast<aura::DispatcherLinux*>(
-      aura::Env::GetInstance()->GetDispatcher())->
-      RemoveDispatcherForRootWindow(this);
+  base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow(this);
 }
 
 bool X11DesktopHandler::Dispatch(const base::NativeEvent& event) {
   // Check for a change to the active window.
   switch (event->type) {
     case PropertyNotify: {
       ::Atom active_window = atom_cache_.GetAtom("_NET_ACTIVE_WINDOW");
 
       if (event->xproperty.window == x_root_window_ &&
           event->xproperty.atom == active_window) {
@@ skipping 24 matching lines @@
   aura::RootWindow* root_window =
       aura::RootWindow::GetForAcceleratedWidget(xid);
   aura::Window* window = root_window ?
       views::DesktopNativeWidgetHelperAura::GetViewsWindowForRootWindow(
           root_window) : NULL;
 
   desktop_activation_client_->ActivateWindow(window);
 }
 
 }  // namespace views