x11: Remove MessagePumpObserver.

ui/aura/window_tree_host_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/window_tree_host_x11.h"
 
 #include <strings.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xfixes.h>
 #include <X11/extensions/XInput2.h>
 #include <X11/extensions/Xrandr.h>
 #include <X11/Xatom.h>
 #include <X11/Xcursor/Xcursor.h>
 #include <X11/Xlib.h>
 
 #include <algorithm>
 #include <limits>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
-#include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/ui_base_switches.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/compositor/layer.h"
 #include "ui/events/event.h"
 #include "ui/events/event_switches.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_codes.h"
+#include "ui/events/platform/platform_event_observer.h"
 #include "ui/events/platform/x11/x11_event_source.h"
 #include "ui/events/x/device_data_manager.h"
 #include "ui/events/x/device_list_cache_x.h"
 #include "ui/events/x/touch_factory_x11.h"
 #include "ui/gfx/screen.h"
 
 using std::max;
 using std::min;
 
 namespace aura {
@@ skipping 55 matching lines @@
 }  // namespace
 
 namespace internal {
 
 // Accomplishes 2 tasks concerning touch event calibration:
 // 1. Being a message-pump observer,
 //    routes all the touch events to the X root window,
 //    where they can be calibrated later.
 // 2. Has the Calibrate method that does the actual bezel calibration,
 //    when invoked from X root window's event dispatcher.
-class TouchEventCalibrate : public base::MessagePumpObserver {
+class TouchEventCalibrate : public ui::PlatformEventObserver {
  public:
   TouchEventCalibrate()
     : left_(0),
       right_(0),
       top_(0),
       bottom_(0) {
-    base::MessageLoopForUI::current()->AddObserver(this);
+    if (ui::PlatformEventSource::GetInstance())
+      ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this);
 #if defined(USE_XI2_MT)
     std::vector<std::string> parts;
     if (Tokenize(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kTouchCalibration), ",", &parts) >= 4) {
       if (!base::StringToInt(parts[0], &left_))
         DLOG(ERROR) << "Incorrect left border calibration value passed.";
       if (!base::StringToInt(parts[1], &right_))
         DLOG(ERROR) << "Incorrect right border calibration value passed.";
       if (!base::StringToInt(parts[2], &top_))
         DLOG(ERROR) << "Incorrect top border calibration value passed.";
       if (!base::StringToInt(parts[3], &bottom_))
         DLOG(ERROR) << "Incorrect bottom border calibration value passed.";
     }
 #endif  // defined(USE_XI2_MT)
   }
 
   virtual ~TouchEventCalibrate() {
-    base::MessageLoopForUI::current()->RemoveObserver(this);
+    if (ui::PlatformEventSource::GetInstance())
+      ui::PlatformEventSource::GetInstance()->RemovePlatformEventObserver(this);
   }
 
   // Modify the location of the |event|,
   // expanding it from |bounds| to (|bounds| + bezels).
   // Required when touchscreen is bigger than screen (i.e. has bezels),
   // because we receive events in touchscreen coordinates,
   // which need to be expanded when converting to screen coordinates,
   // so that location on bezels will be outside of screen area.
   void Calibrate(ui::TouchEvent* event, const gfx::Rect& bounds) {
 #if defined(USE_XI2_MT)
@@ skipping 45 matching lines @@
     if (event->root_location() == event->location()) {
       // Usually those will be equal,
       // if not, I am not sure what the correct value should be.
       event->set_root_location(gfx::Point(x, y));
     }
     event->set_location(gfx::Point(x, y));
 #endif  // defined(USE_XI2_MT)
   }
 
  private:
-  // Overridden from base::MessagePumpObserver:
-  virtual void WillProcessEvent(const base::NativeEvent& event) OVERRIDE {
+  // ui::PlatformEventObserver:
+  virtual void WillProcessEvent(const ui::PlatformEvent& event) OVERRIDE {
 #if defined(USE_XI2_MT)
     if (event->type == GenericEvent &&
         (event->xgeneric.evtype == XI_TouchBegin ||
          event->xgeneric.evtype == XI_TouchUpdate ||
          event->xgeneric.evtype == XI_TouchEnd)) {
       XIDeviceEvent* xievent = static_cast<XIDeviceEvent*>(event->xcookie.data);
       xievent->event = xievent->root;
       xievent->event_x = xievent->root_x;
       xievent->event_y = xievent->root_y;
     }
 #endif  // defined(USE_XI2_MT)
   }
 
-  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
-  }
+  virtual void DidProcessEvent(const ui::PlatformEvent& event) OVERRIDE {}
 
   // The difference in screen's native resolution pixels between
   // the border of the touchscreen and the border of the screen,
   // aka bezel sizes.
   int left_;
   int right_;
   int top_;
   int bottom_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchEventCalibrate);
@@ skipping 680 matching lines @@
 }
 
 namespace test {
 
 void SetUseOverrideRedirectWindowByDefault(bool override_redirect) {
   default_override_redirect = override_redirect;
 }
 
 }  // namespace test
 }  // namespace aura