NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

ash/touch_hud/mus/touch_hud_application.cc

 // Copyright 2016 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 "ash/touch_hud/mus/touch_hud_application.h"
 
 #include "ash/public/interfaces/container.mojom.h"
 #include "ash/touch_hud/touch_hud_renderer.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
-#include "ui/views/touch_event_watcher.h"
+#include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 namespace touch_hud {
 
 // TouchHudUI handles events on the widget of the touch-hud app. After
 // receiving touch events from ui::WindowManagerConnection, it calls
 // ash::TouchHudRenderer to draw out touch points.
 class TouchHudUI : public views::WidgetDelegateView,
-                   public views::TouchEventWatcher {
+                   public views::PointerWatcher {
  public:
   TouchHudUI(views::WindowManagerConnection* window_manager_connection,
              views::Widget* widget)
       : window_manager_connection_(window_manager_connection),
         touch_hud_renderer_(new TouchHudRenderer(widget)) {
-    window_manager_connection_->AddTouchEventWatcher(this);
+    window_manager_connection_->AddPointerWatcher(this, true /* want_moves */);
   }
   ~TouchHudUI() override {
-    window_manager_connection_->RemoveTouchEventWatcher(this);
+    window_manager_connection_->RemovePointerWatcher(this);
   }
 
  private:
   // Overridden from views::WidgetDelegate:
   views::View* GetContentsView() override { return this; }
   base::string16 GetWindowTitle() const override {
     // TODO(beng): use resources.
     return base::ASCIIToUTF16("TouchHud");
   }
 
-  // Overridden from views::TouchEventWatcher:
-  void OnTouchEventObserved(const ui::LocatedEvent& event,
-                            views::Widget* target) override {
-    touch_hud_renderer_->HandleTouchEvent(event);
+  // Overridden from views::PointerWatcher:
+  void OnPointerEventObserved(const ui::LocatedEvent& event,
+                              const gfx::Point& location_in_screen,
+                              views::Widget* target) override {
+    if (event.IsTouchEvent() || event.IsTouchPointerEvent())
+      touch_hud_renderer_->HandleTouchEvent(event);
   }
 
   views::WindowManagerConnection* window_manager_connection_;
   TouchHudRenderer* touch_hud_renderer_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchHudUI);
 };
 
 TouchHudApplication::TouchHudApplication() : binding_(this) {}
 TouchHudApplication::~TouchHudApplication() {}
@@ skipping 41 matching lines @@
   }
 }
 
 void TouchHudApplication::Create(shell::Connection* connection,
                                  mash::mojom::LaunchableRequest request) {
   binding_.Bind(std::move(request));
 }
 
 }  // namespace touch_hud
 }  // namespace ash