gtk: Allow building both the X11 and Gtk message-pumps for gtk.

ui/base/clipboard/clipboard_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/clipboard/clipboard.h"
 
 #include <X11/extensions/Xfixes.h>
 #include <X11/Xatom.h>
 #include <list>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
-#include "base/message_loop/message_pump_aurax11.h"
 #include "base/message_loop/message_pump_observer.h"
+#include "base/message_loop/message_pump_x11.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/x/selection_owner.h"
 #include "ui/base/x/selection_requestor.h"
 #include "ui/base/x/selection_utils.h"
 #include "ui/base/x/x11_atom_cache.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/codec/png_codec.h"
@@ skipping 69 matching lines @@
                                XFixesSelectionClientCloseNotifyMask);
     // This seems to be semi-optional. For some reason, registering for any
     // selection notify events seems to subscribe us to events for both the
     // primary and the clipboard buffers. Register anyway just to be safe.
     XFixesSelectSelectionInput(GetXDisplay(), GetX11RootWindow(),
                                XA_PRIMARY,
                                XFixesSetSelectionOwnerNotifyMask |
                                XFixesSelectionWindowDestroyNotifyMask |
                                XFixesSelectionClientCloseNotifyMask);
 
-    base::MessagePumpAuraX11::Current()->AddObserver(this);
+    base::MessagePumpX11::Current()->AddObserver(this);
   }
 }
 
 SelectionChangeObserver::~SelectionChangeObserver() {
   // We are a singleton; we will outlive our message pump.
 }
 
 SelectionChangeObserver* SelectionChangeObserver::GetInstance() {
   return Singleton<SelectionChangeObserver>::get();
 }
@@ skipping 205 matching lines @@
                            atom_cache_.GetAtom(kClipboard)),
       primary_requestor_(x_display_, x_window_, XA_PRIMARY),
       clipboard_owner_(x_display_, x_window_, atom_cache_.GetAtom(kClipboard)),
       primary_owner_(x_display_, x_window_, XA_PRIMARY) {
   // We don't know all possible MIME types at compile time.
   atom_cache_.allow_uncached_atoms();
 
   XStoreName(x_display_, x_window_, "Chromium clipboard");
   XSelectInput(x_display_, x_window_, PropertyChangeMask);
 
-  base::MessagePumpAuraX11::Current()->AddDispatcherForWindow(this, x_window_);
+  base::MessagePumpX11::Current()->AddDispatcherForWindow(this, x_window_);
 }
 
 Clipboard::AuraX11Details::~AuraX11Details() {
-  base::MessagePumpAuraX11::Current()->RemoveDispatcherForWindow(x_window_);
+  base::MessagePumpX11::Current()->RemoveDispatcherForWindow(x_window_);
 
   XDestroyWindow(x_display_, x_window_);
 }
 
 ::Atom Clipboard::AuraX11Details::LookupSelectionForBuffer(
     Buffer buffer) const {
   if (buffer == BUFFER_STANDARD)
     return atom_cache_.GetAtom(kClipboard);
 
   return XA_PRIMARY;
@@ skipping 508 matching lines @@
   return type;
 }
 
 // static
 const Clipboard::FormatType& Clipboard::GetPepperCustomDataFormatType() {
   CR_DEFINE_STATIC_LOCAL(FormatType, type, (kMimeTypePepperCustomData));
   return type;
 }
 
 }  // namespace ui