Refactor the glib message-pump, and use it as the base for a gtk message pump and an X message pump.

chrome/browser/chromeos/system_key_event_listener.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/system_key_event_listener.h"
 
 #include <gdk/gdkx.h>
 #include <X11/XF86keysym.h>
 
 #include "chrome/browser/chromeos/audio_handler.h"
 #include "chrome/browser/chromeos/brightness_bubble.h"
 #include "chrome/browser/chromeos/volume_bubble.h"
 #include "content/browser/user_metrics.h"
 #include "third_party/cros/chromeos_wm_ipc_enums.h"
 
 #if defined(TOUCH_UI)
-#include "base/message_pump_glib_x_dispatch.h"
+#include "base/message_pump_x.h"
 #endif
 
 namespace chromeos {
 
 namespace {
 
 const double kStepPercentage = 4.0;
 
 }  // namespace
 
@@ skipping 64 matching lines @@
     case WM_IPC_SYSTEM_KEY_VOLUME_UP:
       OnVolumeUp();
       break;
     default:
       DLOG(ERROR) << "SystemKeyEventListener: Unexpected message "
                   << message.param(0)
                   << " received";
   }
 }
 
+#if defined(TOUCH_UI)
+base::MessagePumpObserver::EventStatus
+    SystemKeyEventListener::WillProcessXEvent(XEvent* xevent) {
+  return ProcessedXEvent(xevent) ? EVENT_HANDLED : EVENT_CONTINUE;
+}
+#else  // defined(TOUCH_UI)
 // static
 GdkFilterReturn SystemKeyEventListener::GdkEventFilter(GdkXEvent* gxevent,
                                                        GdkEvent* gevent,
                                                        gpointer data) {
   SystemKeyEventListener* listener = static_cast<SystemKeyEventListener*>(data);
   XEvent* xevent = static_cast<XEvent*>(gxevent);
 
-  return listener->WillProcessXEvent(xevent) ? GDK_FILTER_REMOVE
-                                             : GDK_FILTER_CONTINUE;
+  return listener->ProcessedXEvent(xevent) ? GDK_FILTER_REMOVE
+                                           : GDK_FILTER_CONTINUE;
 }
+#endif  // defined(TOUCH_UI)
 
 void SystemKeyEventListener::GrabKey(int32 key, uint32 mask) {
   uint32 num_lock_mask = Mod2Mask;
   uint32 caps_lock_mask = LockMask;
   Window root = DefaultRootWindow(GDK_DISPLAY());
   XGrabKey(GDK_DISPLAY(), key, mask, root, True, GrabModeAsync, GrabModeAsync);
   XGrabKey(GDK_DISPLAY(), key, mask | caps_lock_mask, root, True,
            GrabModeAsync, GrabModeAsync);
   XGrabKey(GDK_DISPLAY(), key, mask | num_lock_mask, root, True,
            GrabModeAsync, GrabModeAsync);
@@ skipping 31 matching lines @@
 void SystemKeyEventListener::OnVolumeUp() {
   if (audio_handler_->IsMute())
     audio_handler_->SetMute(false);
   else
     audio_handler_->AdjustVolumeByPercent(kStepPercentage);
   VolumeBubble::GetInstance()->ShowBubble(
       audio_handler_->GetVolumePercent());
   BrightnessBubble::GetInstance()->HideBubble();
 }
 
-bool SystemKeyEventListener::WillProcessXEvent(XEvent* xevent) {
+bool SystemKeyEventListener::ProcessedXEvent(XEvent* xevent) {
   if (xevent->type == KeyPress) {
     int32 keycode = xevent->xkey.keycode;
     if (keycode) {
       // Only doing non-Alt/Shift/Ctrl modified keys
       if (!(xevent->xkey.state & (Mod1Mask | ShiftMask | ControlMask))) {
         if ((keycode == key_f8_) ||
             (keycode == key_volume_mute_)) {
           if (keycode == key_f8_)
             UserMetrics::RecordAction(UserMetricsAction("Accel_VolumeMute_F8"));
           OnVolumeMute();
@@ skipping 11 matching lines @@
           OnVolumeUp();
           return true;
         }
       }
     }
   }
   return false;
 }
 
 }  // namespace chromeos