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

ui/base/dragdrop/os_exchange_data_provider_aurax11.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/base/dragdrop/os_exchange_data_provider_aurax11.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/message_loop/message_pump_x11.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "net/base/net_util.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/file_info.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/base/x/x11_util.h"
+#include "ui/events/platform/platform_event_source.h"
 
 // Note: the GetBlah() methods are used immediately by the
 // web_contents_view_aura.cc:PrepareDropData(), while the omnibox is a
 // little more discriminating and calls HasBlah() before trying to get the
 // information.
 
 namespace ui {
 
 namespace {
 
@@ skipping 48 matching lines @@
           NULL)),
       atom_cache_(x_display_, kAtomsToCache),
       format_map_(),
       selection_owner_(x_display_, x_window_,
                        atom_cache_.GetAtom(kDndSelection)) {
   // We don't know all possible MIME types at compile time.
   atom_cache_.allow_uncached_atoms();
 
   XStoreName(x_display_, x_window_, "Chromium Drag & Drop Window");
 
-  base::MessagePumpX11::Current()->AddDispatcherForWindow(this, x_window_);
+  PlatformEventSource::GetInstance()->AddPlatformEventDispatcher(this);
 }
 
 OSExchangeDataProviderAuraX11::~OSExchangeDataProviderAuraX11() {
   if (own_window_) {
-    base::MessagePumpX11::Current()->RemoveDispatcherForWindow(x_window_);
+    PlatformEventSource::GetInstance()->RemovePlatformEventDispatcher(this);
     XDestroyWindow(x_display_, x_window_);
   }
 }
 
 void OSExchangeDataProviderAuraX11::TakeOwnershipOfSelection() const {
   selection_owner_.TakeOwnershipOfSelection(format_map_);
 }
 
 void OSExchangeDataProviderAuraX11::RetrieveTargets(
     std::vector<Atom>* targets) const {
@@ skipping 385 matching lines @@
 }
 
 const gfx::ImageSkia& OSExchangeDataProviderAuraX11::GetDragImage() const {
   return drag_image_;
 }
 
 const gfx::Vector2d& OSExchangeDataProviderAuraX11::GetDragImageOffset() const {
   return drag_image_offset_;
 }
 
-uint32_t OSExchangeDataProviderAuraX11::Dispatch(
-    const base::NativeEvent& event) {
+bool OSExchangeDataProviderAuraX11::CanDispatchEvent(
+    const PlatformEvent& event) {
+  return event->xany.window == x_window_;
+}
+
+uint32_t OSExchangeDataProviderAuraX11::DispatchEvent(
+    const PlatformEvent& event) {
   XEvent* xev = event;
   switch (xev->type) {
     case SelectionRequest:
       selection_owner_.OnSelectionRequest(xev->xselectionrequest);
-      break;
+      return ui::POST_DISPATCH_STOP_PROPAGATION;
     default:
       NOTIMPLEMENTED();
   }
-
-  return POST_DISPATCH_NONE;
+  return ui::POST_DISPATCH_NONE;
 }
 
 bool OSExchangeDataProviderAuraX11::GetPlainTextURL(GURL* url) const {
   base::string16 text;
   if (GetString(&text)) {
     GURL test_url(text);
     if (test_url.is_valid()) {
       *url = test_url;
       return true;
     }
   }
 
   return false;
 }
 
 std::vector< ::Atom> OSExchangeDataProviderAuraX11::GetTargets() const {
   return format_map_.GetTypes();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // OSExchangeData, public:
 
 // static
 OSExchangeData::Provider* OSExchangeData::CreateProvider() {
   return new OSExchangeDataProviderAuraX11();
 }
 
 }  // namespace ui