Consolidate win/x dispatchers

base/message_pump_win.cc

Index: base/message_pump_win.cc
diff --git a/base/message_pump_win.cc b/base/message_pump_win.cc
index 740ddd9db4d4703b30e61bd6f13382f1c25eabeb..510bf9b7160ee4de739de6da049f2e2635ddf7bd 100644
--- a/base/message_pump_win.cc
+++ b/base/message_pump_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -38,7 +38,7 @@ void MessagePumpWin::DidProcessMessage(const MSG& msg) {
 }
 
 void MessagePumpWin::RunWithDispatcher(
-    Delegate* delegate, Dispatcher* dispatcher) {
+    Delegate* delegate, MessagePumpDispatcher* dispatcher) {
   RunState s;
   s.delegate = delegate;
   s.dispatcher = dispatcher;
@@ -351,7 +351,7 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
   WillProcessMessage(msg);
 
   if (state_->dispatcher) {
-    if (!state_->dispatcher->Dispatch(msg))
+    if (state_->dispatcher->Dispatch(msg) == base::EVENT_QUIT)
       state_->should_quit = true;
   } else {
     TranslateMessage(&msg);