ash: Eliminate PointerWatcherDelegate

ash/aura/wm_shell_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.
 
 #ifndef ASH_AURA_WM_SHELL_AURA_H_
 #define ASH_AURA_WM_SHELL_AURA_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/aura/wm_lookup_aura.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/window_tree_host_manager.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "ui/wm/public/activation_change_observer.h"
 
 namespace ash {
 
+class PointerWatcherAdapter;
+
 class ASH_EXPORT WmShellAura : public WmShell,
                                public aura::client::ActivationChangeObserver,
                                public WindowTreeHostManager::Observer {
  public:
   explicit WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate);
   ~WmShellAura() override;
 
   static WmShellAura* Get();
 
+  void CreatePointerWatcherAdapter();
+
   // WmShell:
   void Shutdown() override;
   WmWindow* NewContainerWindow() override;
   WmWindow* GetFocusedWindow() override;
   WmWindow* GetActiveWindow() override;
   WmWindow* GetCaptureWindow() override;
   WmWindow* GetPrimaryRootWindow() override;
   WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
   const DisplayInfo& GetDisplayInfo(int64_t display_id) const override;
   bool IsActiveDisplayId(int64_t display_id) const override;
@@ skipping 46 matching lines @@
                          aura::Window* gained_active,
                          aura::Window* lost_active) override;
   void OnAttemptToReactivateWindow(aura::Window* request_active,
                                    aura::Window* actual_active) override;
 
   // WindowTreeHostManager::Observer:
   void OnDisplayConfigurationChanging() override;
   void OnDisplayConfigurationChanged() override;
 
   WmLookupAura wm_lookup_;
+  std::unique_ptr<PointerWatcherAdapter> pointer_watcher_adapter_;
+
   bool added_activation_observer_ = false;
   base::ObserverList<WmActivationObserver> activation_observers_;
 
   bool added_display_observer_ = false;
   base::ObserverList<WmDisplayObserver> display_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellAura);
 };
 
 }  // namespace ash
 
 #endif  // ASH_AURA_WM_SHELL_AURA_H_