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

ui/views/widget/desktop_aura/x11_window_event_filter.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/views/widget/desktop_aura/x11_window_event_filter.h"
 
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 
-#include "base/message_loop/message_pump_aurax11.h"
+#include "base/message_loop/message_pump_x11.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/hit_test.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace {
 
 // These constants are defined in the Extended Window Manager Hints
@@ skipping 29 matching lines @@
   "_NET_WM_MOVERESIZE",
   NULL
 };
 
 }  // namespace
 
 namespace views {
 
 X11WindowEventFilter::X11WindowEventFilter(
     aura::RootWindow* root_window)
-    : xdisplay_(base::MessagePumpAuraX11::GetDefaultXDisplay()),
+    : xdisplay_(base::MessagePumpX11::GetDefaultXDisplay()),
       xwindow_(root_window->GetAcceleratedWidget()),
       x_root_window_(DefaultRootWindow(xdisplay_)),
       atom_cache_(xdisplay_, kAtomsToCache),
       is_active_(false) {
 }
 
 X11WindowEventFilter::~X11WindowEventFilter() {
 }
 
 void X11WindowEventFilter::SetUseHostWindowBorders(bool use_os_border) {
   MotifWmHints motif_hints;
   memset(&motif_hints, 0, sizeof(motif_hints));
   motif_hints.flags = kHintsDecorations;
   motif_hints.decorations = use_os_border ? 1 : 0;
 
   ::Atom hint_atom = atom_cache_.GetAtom("_MOTIF_WM_HINTS");
-  XChangeProperty(base::MessagePumpAuraX11::GetDefaultXDisplay(),
+  XChangeProperty(base::MessagePumpX11::GetDefaultXDisplay(),
                   xwindow_,
                   hint_atom,
                   hint_atom,
                   32,
                   PropModeReplace,
                   reinterpret_cast<unsigned char*>(&motif_hints),
                   sizeof(MotifWmHints)/sizeof(long));
 }
 
 void X11WindowEventFilter::OnMouseEvent(ui::MouseEvent* event) {
@@ skipping 74 matching lines @@
   event.xclient.data.l[4] = 0;
 
   XSendEvent(xdisplay_, x_root_window_, False,
              SubstructureRedirectMask | SubstructureNotifyMask,
              &event);
 
   return true;
 }
 
 }  // namespace views