Revert 245226 "Nukes MessageLoop::Dispatcher"

trunk/src/ui/views/widget/desktop_aura/x11_desktop_handler.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_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
 #define UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_
 
 #include <X11/Xlib.h>
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
 #undef RootWindow
 
-#include "base/message_loop/message_pump_dispatcher.h"
+#include "base/message_loop/message_loop.h"
 #include "ui/aura/env_observer.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "ui/gfx/x/x11_types.h"
 #include "ui/views/views_export.h"
 
 template <typename T> struct DefaultSingletonTraits;
 
 namespace views {
 
 // A singleton that owns global objects related to the desktop and listens for
 // X11 events on the X11 root window. Destroys itself when aura::Env is
 // deleted.
-class VIEWS_EXPORT X11DesktopHandler : public base::MessagePumpDispatcher,
+class VIEWS_EXPORT X11DesktopHandler : public base::MessageLoop::Dispatcher,
                                        public aura::EnvObserver {
  public:
   // Returns the singleton handler.
   static X11DesktopHandler* get();
 
   // Sends a request to the window manager to activate |window|.
   // This method should only be called if the window is already mapped.
   void ActivateWindow(::Window window);
 
   // Checks if the current active window is |window|.
   bool IsActiveWindow(::Window window) const;
 
   // Processes activation/focus related events. Some of these events are
   // dispatched to the X11 window dispatcher, and not to the X11 root-window
   // dispatcher. The window dispatcher sends these events to here.
   void ProcessXEvent(const base::NativeEvent& event);
 
-  // Overridden from MessagePumpDispatcher:
+  // Overridden from MessageLoop::Dispatcher:
   virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
   // Overridden from aura::EnvObserver:
   virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
   virtual void OnWillDestroyEnv() OVERRIDE;
 
  private:
   explicit X11DesktopHandler();
   virtual ~X11DesktopHandler();
 
@@ skipping 12 matching lines @@
   ui::X11AtomCache atom_cache_;
 
   bool wm_supports_active_window_;
 
   DISALLOW_COPY_AND_ASSIGN(X11DesktopHandler);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_DESKTOP_AURA_X11_DESKTOP_HANDLER_H_