ash: Eliminate PointerWatcherDelegate

ash/aura/pointer_watcher_adapter.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.
 
+#ifndef ASH_AURA_POINTER_WATCHER_ADAPTER_H_
+#define ASH_AURA_POINTER_WATCHER_ADAPTER_H_
+
 #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 PointerWatcher;
 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 {
+class ASH_EXPORT PointerWatcherAdapter : public ui::EventHandler {
  public:
-  PointerWatcherDelegateAura();
-  ~PointerWatcherDelegateAura() override;
+  PointerWatcherAdapter();
+  ~PointerWatcherAdapter() override;
 
-  // PointerWatcherDelegate:
-  void AddPointerWatcher(views::PointerWatcher* watcher,
-                         bool wants_moves) override;
-  void RemovePointerWatcher(views::PointerWatcher* watcher) override;
+  // See WmShell::AddPointerWatcher() for details.
+  void AddPointerWatcher(views::PointerWatcher* watcher, bool wants_moves);
+  void RemovePointerWatcher(views::PointerWatcher* watcher);
 
   // 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;
 
   // 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
   // destruction. Two sets of observers are maintained, one for observers not
   // needing moves |non_move_watchers_| and |move_watchers_| for those
   // observers wanting moves too.
   base::ObserverList<views::PointerWatcher, true> non_move_watchers_;
   base::ObserverList<views::PointerWatcher, true> move_watchers_;
 
-  DISALLOW_COPY_AND_ASSIGN(PointerWatcherDelegateAura);
+  DISALLOW_COPY_AND_ASSIGN(PointerWatcherAdapter);
 };
 
 }  // namespace ash
+
+#endif  // ASH_AURA_POINTER_WATCHER_ADAPTER_H_