ash: Eliminate PointerWatcherDelegate

ash/aura/pointer_watcher_adapter.h

Index: ash/aura/pointer_watcher_adapter.h
diff --git a/ash/pointer_watcher_delegate_aura.h b/ash/aura/pointer_watcher_adapter.h
similarity index 75%
rename from ash/pointer_watcher_delegate_aura.h
rename to ash/aura/pointer_watcher_adapter.h
index 2c47e20ed72cf1d40c71f6284897a36e5c0b26a9..b17f8cbd00b610c64f163353020738adf695e262 100644
--- a/ash/pointer_watcher_delegate_aura.h
+++ b/ash/aura/pointer_watcher_adapter.h
@@ -2,8 +2,10 @@
 // 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"
@@ -18,6 +20,7 @@ class PointerEvent;
 }
 
 namespace views {
+class PointerWatcher;
 class Widget;
 }
 
@@ -25,16 +28,14 @@ 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;
@@ -58,7 +59,9 @@ class ASH_EXPORT PointerWatcherDelegateAura : public PointerWatcherDelegate,
   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_