Wires up WmShellMus::Add/RemovePointerWatcher

ash/pointer_watcher_delegate_aura.h

 // 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/ash_export.h"
 #include "ash/common/pointer_watcher_delegate.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/events/event_handler.h"
 
 namespace gfx {
 class Point;
 }
 
 namespace ui {
 class LocatedEvent;
+class PointerEvent;
 }
 
 namespace views {
 class Widget;
 }
 
 namespace ash {
 
 // Support for PointerWatchers in non-mus ash, implemented with a pre-target
 // EventHandler on the Shell.
 class ASH_EXPORT PointerWatcherDelegateAura : public PointerWatcherDelegate,
                                               public ui::EventHandler {
  public:
   PointerWatcherDelegateAura();
   ~PointerWatcherDelegateAura() override;
 
   // PointerWatcherDelegate:
-  void AddPointerWatcher(views::PointerWatcher* watcher) override;
+  void AddPointerWatcher(views::PointerWatcher* watcher,
+                         bool wants_moves) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
 
   // ui::EventHandler:
   void OnMouseEvent(ui::MouseEvent* event) override;
   void OnTouchEvent(ui::TouchEvent* event) override;
 
  private:
   gfx::Point GetLocationInScreen(const ui::LocatedEvent& event) const;
   views::Widget* GetTargetWidget(const ui::LocatedEvent& event) const;
 
-  // Must be empty on destruction.
+  // Calls OnPointerEventObserved() on the appropriate set of watchers as
+  // determined by the type of event. |original_event| is the original
+  // event supplied to OnMouseEvent()/OnTouchEvent(), |pointer_event| is
+  // |original_event| converted to a PointerEvent.
+  void NotifyWatchers(const ui::PointerEvent& pointer_event,
+                      const ui::LocatedEvent& original_event);
+
+  // The true parameter to ObserverList indicates the list Must be empty on

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

nit: Must -> must and rewrap lines

Thanks for the nice docs, btw.

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

Done.

+  // destruction.
+  // Two sets of observers are maintained, one for observers not needing
+  // moves |pointer_watchers_| and |move_pointer_watchers_| for those observers
+  // wanting moves too.
   base::ObserverList<views::PointerWatcher, true> pointer_watchers_;

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

optional: Maybe non_move_pointer_watchers_?  If that's too long, move_watchers_
and non_move_watchers_?

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

I like non_move_watchers_ and move_watchers_. Done.

+  base::ObserverList<views::PointerWatcher, true> move_pointer_watchers_;

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

Or maybe this one should be called |pointer_watchers_| and the other one
|non_move_pointer_watchers_|? I got briefly confused reading NotifyWatchers
about why both observerlists were being notified, and I think it was due to
names.

 
   DISALLOW_COPY_AND_ASSIGN(PointerWatcherDelegateAura);
 };
 
 }  // namespace ash