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

views/widget/native_widget_gtk.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 "views/widget/native_widget_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/extensions/shape.h>
 #include <X11/Xatom.h>
@@ skipping 1614 matching lines @@
 
 void NativeWidgetGtk::OnShow(GtkWidget* widget) {
 }
 
 void NativeWidgetGtk::OnMap(GtkWidget* widget) {
 #if defined(TOUCH_UI)
   // Force an expose event to trigger OnPaint for touch. This is
   // a workaround for a bug that X Expose event does not trigger
   // Gdk's expose signal. This happens when you try to open views menu
   // while a virtual keyboard gets kicked in or out. This seems to be
-  // a bug in message_pump_glib_x.cc as we do get X Expose event but
+  // a bug in message_pump_x.cc as we do get X Expose event but
   // it doesn't trigger gtk's expose signal. We're not going to fix this
   // as we're removing gtk and migrating to new compositor.
   gdk_window_process_all_updates();
 #endif
 }
 
 void NativeWidgetGtk::OnHide(GtkWidget* widget) {
 }
 
 gboolean NativeWidgetGtk::OnWindowStateEvent(GtkWidget* widget,
@@ skipping 454 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (Widget::Widgets::iterator it = widgets.begin();
        it != widgets.end(); ++it) {
     (*it)->NotifyNativeViewHierarchyChanged(true, new_parent);
   }
 }
 
 }  // namespace internal
 }  // namespace views