Consolidate win/x dispatchers

ui/gfx/compositor/test/test_compositor_host_linux.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 "ui/gfx/compositor/test/test_compositor_host.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 20 matching lines @@
 
  private:
   // Overridden from TestCompositorHost:
   virtual void Show() OVERRIDE;
   virtual ui::Compositor* GetCompositor() OVERRIDE;
 
   // Overridden from CompositorDelegate:
   virtual void ScheduleDraw() OVERRIDE;
 
   // Overridden from MessagePumpDispatcher:
-#if defined(USE_AURA)
-  virtual base::MessagePumpDispatcher::DispatchStatus
-    Dispatch(XEvent* xev) OVERRIDE;
-#elif defined(TOOLKIT_GTK)
-  virtual bool Dispatch(GdkEvent* event) OVERRIDE;
-#endif
+  virtual bool Dispatch(const base::NativeEvent& event) OVERRIDE;
 
   void Draw();
 
   gfx::Rect bounds_;
 
   scoped_ptr<ui::Compositor> compositor_;
 
   XID window_;
 
   base::WeakPtrFactory<TestCompositorHostLinux> method_factory_;
@@ skipping 40 matching lines @@
 
 void TestCompositorHostLinux::ScheduleDraw() {
   if (!method_factory_.HasWeakPtrs()) {
     MessageLoopForUI::current()->PostTask(
         FROM_HERE,
         base::Bind(&TestCompositorHostLinux::Draw,
                    method_factory_.GetWeakPtr()));
   }
 }
 
-#if defined(USE_AURA)
-base::MessagePumpDispatcher::DispatchStatus TestCompositorHostLinux::Dispatch(
-    XEvent* xev) {
-  return MessagePumpDispatcher::EVENT_IGNORED;
+bool TestCompositorHostLinux::Dispatch(const base::NativeEvent& event) {
+  return true;
 }
-#elif defined(TOOLKIT_GTK)
-bool TestCompositorHostLinux::Dispatch(GdkEvent*) {
-  return false;
-}
-#endif
 
 void TestCompositorHostLinux::Draw() {
   if (compositor_.get())
     compositor_->Draw(false);
 }
 
 // static
 TestCompositorHost* TestCompositorHost::Create(const gfx::Rect& bounds) {
   return new TestCompositorHostLinux(bounds);
 }
 
 }  // namespace ui