[master] x11: Move X event handling out of the message-pump.

ui/base/dragdrop/os_exchange_data_provider_aurax11.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_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_
 #define UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_
 
 #include <X11/Xlib.h>
 
 // Get rid of a macro from Xlib.h that conflicts with Aura's RootWindow class.
 #undef RootWindow
 
 #include <map>
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_pump_dispatcher.h"
 #include "base/pickle.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/x/selection_owner.h"
 #include "ui/base/x/selection_requestor.h"
 #include "ui/base/x/selection_utils.h"
+#include "ui/events/platform/platform_event_dispatcher.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/vector2d.h"
 #include "ui/gfx/x/x11_atom_cache.h"
 #include "url/gurl.h"
 
 namespace ui {
 
 class Clipboard;
 class OSExchangeDataProviderAuraX11Test;
 
 // OSExchangeData::Provider implementation for aura on linux.
 class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
     : public OSExchangeData::Provider,
-      public base::MessagePumpDispatcher {
+      public ui::PlatformEventDispatcher {
  public:
   // |x_window| is the window the cursor is over, and |selection| is the set of
   // data being offered.
   OSExchangeDataProviderAuraX11(::Window x_window,
                                 const SelectionFormatMap& selection);
 
   // Creates a Provider for sending drag information. This creates its own,
   // hidden X11 window to own send data.
   OSExchangeDataProviderAuraX11();
 
@@ skipping 44 matching lines @@
 
   virtual void SetHtml(const base::string16& html,
                        const GURL& base_url) OVERRIDE;
   virtual bool GetHtml(base::string16* html, GURL* base_url) const OVERRIDE;
   virtual bool HasHtml() const OVERRIDE;
   virtual void SetDragImage(const gfx::ImageSkia& image,
                             const gfx::Vector2d& cursor_offset) OVERRIDE;
   virtual const gfx::ImageSkia& GetDragImage() const OVERRIDE;
   virtual const gfx::Vector2d& GetDragImageOffset() const OVERRIDE;
 
-  // Overridden from base::MessagePumpDispatcher:
-  virtual uint32_t Dispatch(const base::NativeEvent& event) OVERRIDE;
+  // ui::PlatformEventDispatcher:
+  virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE;
+  virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE;
 
  private:
   friend class OSExchangeDataProviderAuraX11Test;
   typedef std::map<OSExchangeData::CustomFormat, Pickle>  PickleData;
 
   // Returns true if |formats_| contains a string format and the string can be
   // parsed as a URL.
   bool GetPlainTextURL(GURL* url) const;
 
   // Returns the targets in |format_map_|.
@@ skipping 29 matching lines @@
 
   // Takes a snapshot of |format_map_| and offers it to other windows.
   mutable SelectionOwner selection_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAuraX11);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_DRAGDROP_OS_EXCHANGE_DATA_PROVIDER_AURAX11_H_