Wires up WmShellMus::Add/RemovePointerWatcher

ash/pointer_watcher_delegate_aura.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/pointer_watcher_delegate_aura.h"
 
 #include "ash/shell.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/views/pointer_watcher.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 PointerWatcherDelegateAura::PointerWatcherDelegateAura() {
   Shell::GetInstance()->AddPreTargetHandler(this);
 }
 
 PointerWatcherDelegateAura::~PointerWatcherDelegateAura() {
   Shell::GetInstance()->RemovePreTargetHandler(this);
 }
 
 void PointerWatcherDelegateAura::AddPointerWatcher(
-    views::PointerWatcher* watcher) {
-  pointer_watchers_.AddObserver(watcher);
+    views::PointerWatcher* watcher,
+    bool wants_moves) {
+  // We only allow a watcher to be added once. That is, we don't consider
+  // the pair of |watcher| and |wants_move| unique, just |watcher|.
+  if (wants_moves) {
+    DCHECK(!pointer_watchers_.HasObserver(watcher));
+    move_pointer_watchers_.AddObserver(watcher);
+  } else {
+    DCHECK(!move_pointer_watchers_.HasObserver(watcher));
+    pointer_watchers_.AddObserver(watcher);
+  }
 }
 
 void PointerWatcherDelegateAura::RemovePointerWatcher(
     views::PointerWatcher* watcher) {
   pointer_watchers_.RemoveObserver(watcher);
+  move_pointer_watchers_.RemoveObserver(watcher);
 }
 
 void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) {
   // For compatibility with the mus version, don't send moves.
   if (event->type() != ui::ET_MOUSE_PRESSED &&
       event->type() != ui::ET_MOUSE_RELEASED)
     return;
+
   if (event->type() == ui::ET_MOUSE_CAPTURE_CHANGED) {

[James Cook, 2016/08/12 16:08:53]

Move above 47 (merge should handle that I think)

[sky, 2016/08/12 17:59:37]

Ya, sorry, I fixed it after you pointed the error out in the last review and
updated a patch while you reviewing.

     FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
                       OnMouseCaptureChanged());
+    FOR_EACH_OBSERVER(views::PointerWatcher, move_pointer_watchers_,
+                      OnMouseCaptureChanged());
     return;
   }
+
   if (!ui::PointerEvent::CanConvertFrom(*event))

[James Cook, 2016/08/12 16:08:53]

DCHECK here instead? event must be pressed or release at this point.

[sky, 2016/08/12 17:59:37]

Turns out mouse wheel events aren't pointer events either (this is why I
suggested keeping the name mouseevents in the last review vs
OnMouseCaptureChanged). So, this has to be a conditional.

     return;
-  ui::PointerEvent mouse_pointer_event(*event);
-  FOR_EACH_OBSERVER(
-      views::PointerWatcher, pointer_watchers_,
-      OnPointerEventObserved(mouse_pointer_event, GetLocationInScreen(*event),
-                             GetTargetWidget(*event)));
+
+  NotifyWatchers(ui::PointerEvent(*event), *event);
 }
 
 void PointerWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) {
   // For compatibility with the mus version, don't send moves.
   if (event->type() != ui::ET_TOUCH_PRESSED &&
       event->type() != ui::ET_TOUCH_RELEASED)
     return;
-  ui::PointerEvent touch_pointer_event(*event);
-  FOR_EACH_OBSERVER(
-      views::PointerWatcher, pointer_watchers_,
-      OnPointerEventObserved(touch_pointer_event, GetLocationInScreen(*event),
-                             GetTargetWidget(*event)));
+
+  DCHECK(ui::PointerEvent::CanConvertFrom(*event));
+  NotifyWatchers(ui::PointerEvent(*event), *event);
 }
 
 gfx::Point PointerWatcherDelegateAura::GetLocationInScreen(
     const ui::LocatedEvent& event) const {
   aura::Window* target = static_cast<aura::Window*>(event.target());
   gfx::Point location_in_screen = event.location();
   aura::client::GetScreenPositionClient(target->GetRootWindow())
       ->ConvertPointToScreen(target, &location_in_screen);
   return location_in_screen;
 }
 
 views::Widget* PointerWatcherDelegateAura::GetTargetWidget(
     const ui::LocatedEvent& event) const {
   aura::Window* window = static_cast<aura::Window*>(event.target());
   return views::Widget::GetTopLevelWidgetForNativeView(window);
 }
 
+void PointerWatcherDelegateAura::NotifyWatchers(
+    const ui::PointerEvent& event,
+    const ui::LocatedEvent& original_event) {
+  const gfx::Point screen_location(GetLocationInScreen(original_event));
+  views::Widget* target_widget = GetTargetWidget(original_event);
+  FOR_EACH_OBSERVER(
+      views::PointerWatcher, move_pointer_watchers_,
+      OnPointerEventObserved(event, screen_location, target_widget));
+  if (event.type() != ui::ET_MOUSE_MOVED &&
+      event.type() != ui::ET_TOUCH_MOVED) {
+    FOR_EACH_OBSERVER(
+        views::PointerWatcher, pointer_watchers_,
+        OnPointerEventObserved(event, screen_location, target_widget));
+  }
+}
+
 }  // namespace ash