Consolidate win/x dispatchers

base/message_pump_x.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 "base/message_pump_x.h"
 
 #include <X11/extensions/XInput2.h>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
@@ skipping 126 matching lines @@
                                  XEvent* xev) {
   bool should_quit = false;
 
   bool have_cookie = false;
   if (xev->type == GenericEvent &&
       XGetEventData(xev->xgeneric.display, &xev->xcookie)) {
     have_cookie = true;
   }
 
   if (!WillProcessXEvent(xev)) {
-    MessagePumpDispatcher::DispatchStatus status =
-        dispatcher->Dispatch(xev);
+    DispatchStatus status = dispatcher->Dispatch(xev);
 
-    if (status == MessagePumpDispatcher::EVENT_QUIT) {
+    if (status == EVENT_QUIT) {
       should_quit = true;
       Quit();
-    } else if (status == MessagePumpDispatcher::EVENT_IGNORED) {
+    } else if (status == EVENT_IGNORED) {
       DVLOG(1) << "Event (" << xev->type << ") not handled.";
     }
     DidProcessXEvent(xev);
   }
 
   if (have_cookie) {
     XFreeEventData(xev->xgeneric.display, &xev->xcookie);
   }
 
   return should_quit;
@@ skipping 26 matching lines @@
       return true;
   }
   return false;
 }
 
 void MessagePumpX::DidProcessXEvent(XEvent* xevent) {
   FOR_EACH_OBSERVER(MessagePumpObserver, observers(), DidProcessEvent(xevent));
 }
 
 }  // namespace base