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

views/controls/menu/nested_dispatcher_gtk.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/controls/menu/nested_dispatcher_gtk.h"
 
 #if defined(TOUCH_UI)
 #include "views/focus/accelerator_handler.h"
 #endif
 
 namespace views {
@@ skipping 13 matching lines @@
     MessageLoopForUI::current()->SetNestableTasksAllowed(nestable);
   bool creator_is_deleted = creator_ == NULL;
   delete this;
   return creator_is_deleted;
 }
 
 void NestedDispatcherGtk::CreatorDestroyed() {
   creator_ = NULL;
 }
 
-bool NestedDispatcherGtk::Dispatch(GdkEvent* event) {
-  if (creator_ != NULL) {
 #if defined(TOUCH_UI)
-    return static_cast<base::MessagePumpForUI::Dispatcher*>
-        (creator_)->Dispatch(event);
-#else
-    return creator_->Dispatch(event);
-#endif
-  } else {
-    return false;
-  }
-}
-
-#if defined(TOUCH_UI)
-base::MessagePumpGlibXDispatcher::DispatchStatus
+base::MessagePumpDispatcher::DispatchStatus
     NestedDispatcherGtk::DispatchX(XEvent* xevent) {
   return creator_->DispatchX(xevent);
 }
-#endif
+#else
+bool NestedDispatcherGtk::Dispatch(GdkEvent* event) {
+  if (creator_ != NULL)

[sky, 2011/06/24 15:27:12]

nit: return creator_ && creator_->Dispatch(event);

[sadrul, 2011/06/24 17:14:01]

Done.

+    return creator_->Dispatch(event);
+  else
+    return false;
+}
+#endif  // defined(TOUCH_UI)
 
 }  // namespace views