ash: Eliminate PointerWatcherDelegate

ash/aura/wm_shell_aura.h

Index: ash/aura/wm_shell_aura.h
diff --git a/ash/aura/wm_shell_aura.h b/ash/aura/wm_shell_aura.h
index f584092f13b4d2fe2b7c6ece24bcf09438a7136c..0cbd40982ae2235848b01839701f74795bbba663 100644
--- a/ash/aura/wm_shell_aura.h
+++ b/ash/aura/wm_shell_aura.h
@@ -17,6 +17,8 @@
 
 namespace ash {
 
+class PointerWatcherAdapter;
+
 class ASH_EXPORT WmShellAura : public WmShell,
                                public aura::client::ActivationChangeObserver,
                                public WindowTreeHostManager::Observer {
@@ -26,6 +28,8 @@ class ASH_EXPORT WmShellAura : public WmShell,
 
   static WmShellAura* Get();
 
+  void CreatePointerWatcherAdapter();
+
   // WmShell:
   void Shutdown() override;
   WmWindow* NewContainerWindow() override;
@@ -92,6 +96,8 @@ class ASH_EXPORT WmShellAura : public WmShell,
   void OnDisplayConfigurationChanged() override;
 
   WmLookupAura wm_lookup_;
+  std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
+
   bool added_activation_observer_ = false;
   base::ObserverList<WmActivationObserver> activation_observers_;