Consolidate win/x dispatchers

ui/aura/monitor_change_observer_x11.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/aura/monitor_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 37 matching lines @@
       Env::GetInstance()->GetDispatcher())->
       WindowDispatcherCreated(x_root_window_, this);
 }
 
 MonitorChangeObserverX11::~MonitorChangeObserverX11() {
   static_cast<DispatcherLinux*>(
       Env::GetInstance()->GetDispatcher())->
       WindowDispatcherDestroying(x_root_window_);
 }
 
-base::MessagePumpDispatcher::DispatchStatus
-MonitorChangeObserverX11::Dispatch(XEvent* event) {
+base::DispatchStatus MonitorChangeObserverX11::Dispatch(
+    const base::NativeEvent& event) {
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
     NotifyMonitorChange();
-    return base::MessagePumpDispatcher::EVENT_PROCESSED;
+    return base::EVENT_PROCESSED;
   }
-  return base::MessagePumpDispatcher::EVENT_IGNORED;
+  return base::EVENT_IGNORED;
 }
 
 void MonitorChangeObserverX11::NotifyMonitorChange() {
   if (!MonitorManager::use_fullscreen_host_window())
     return;  // Use the default monitor that monitor manager determined.
 
   XRRScreenResources* screen_resources =
       XRRGetScreenResources(xdisplay_, x_root_window_);
   std::map<XID, XRRCrtcInfo*> crtc_info_map;
 
@@ skipping 43 matching lines @@
   // PowerManager lays out the outputs vertically. Sort them by Y
   // coordinates.
   std::sort(monitors.begin(), monitors.end(), CompareMonitorY);
   Env::GetInstance()->monitor_manager()
       ->OnNativeMonitorsChanged(monitors);
   STLDeleteContainerPointers(monitors.begin(), monitors.end());
 }
 
 }  // namespace internal
 }  // namespace aura