Merge aura::DispatcherLinux into base::MessagePumpAuraX11.

ui/aura/display_change_observer_x11.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/display_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include <X11/extensions/Xrandr.h>
 
 #include "base/message_pump_aurax11.h"
-#include "ui/aura/dispatcher_linux.h"
 #include "ui/aura/env.h"
 #include "ui/aura/display_manager.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 
 namespace aura {
 namespace internal {
 
 namespace {
@@ skipping 52 matching lines @@
 }
 
 }  // namespace
 
 DisplayChangeObserverX11::DisplayChangeObserverX11()
     : xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       xrandr_event_base_(0) {
   int error_base_ignored;
   XRRQueryExtension(xdisplay_, &xrandr_event_base_, &error_base_ignored);
-  static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
-      AddDispatcherForRootWindow(this);
+  base::MessagePumpAuraX11::Current()->AddDispatcherForRootWindow(this);
 }
 
 DisplayChangeObserverX11::~DisplayChangeObserverX11() {
-  static_cast<DispatcherLinux*>(Env::GetInstance()->GetDispatcher())->
-      RemoveDispatcherForRootWindow(this);
+  base::MessagePumpAuraX11::Current()->RemoveDispatcherForRootWindow(this);
 }
 
 bool DisplayChangeObserverX11::Dispatch(const base::NativeEvent& event) {
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
     NotifyDisplayChange();
   }
   return true;
 }
 
 void DisplayChangeObserverX11::NotifyDisplayChange() {
@@ skipping 83 matching lines @@
       iter->set_id(id);
       ++id;
     }
   }
 
   Env::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 }  // namespace internal
 }  // namespace aura