Wires up WmShellMus::Add/RemovePointerWatcher

ash/mus/bridge/wm_shell_mus.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_MUS_BRIDGE_WM_SHELL_MUS_H_
 #define ASH_MUS_BRIDGE_WM_SHELL_MUS_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
 #include "ash/common/wm_shell.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "services/ui/public/cpp/window_tree_client_observer.h"
 
 namespace shell {
 class Connector;
 }
 
 namespace ui {
 class WindowTreeClient;
 }
 
+namespace views {
+class PointerWatcherEventRouter;
+}
+
 namespace ash {
 namespace mus {
 
 class AcceleratorControllerDelegateMus;
 class AcceleratorControllerRegistrar;
 class WindowManager;
 class WmRootWindowControllerMus;
 class WmShellMusTestApi;
 class WmWindowMus;
 
 // WmShell implementation for mus.
 class WmShellMus : public WmShell, public ui::WindowTreeClientObserver {
  public:
   WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
-             WindowManager* window_manager);
+             WindowManager* window_manager,
+             views::PointerWatcherEventRouter* pointer_watcher_event_router);
   ~WmShellMus() override;
 
   static WmShellMus* Get();
 
   void AddRootWindowController(WmRootWindowControllerMus* controller);
   void RemoveRootWindowController(WmRootWindowControllerMus* controller);
 
   // Returns the ancestor of |window| (including |window|) that is considered
   // toplevel. |window| may be null.
   static WmWindowMus* GetToplevelAncestor(ui::Window* window);
@@ skipping 39 matching lines @@
   CreateScopedDisableInternalMouseAndKeyboard() override;
   std::unique_ptr<WmImmersiveFullscreenController>
   CreateImmersiveFullscreenController() override;
   void OnOverviewModeStarting() override;
   void OnOverviewModeEnded() override;
   SessionStateDelegate* GetSessionStateDelegate() override;
   void AddActivationObserver(WmActivationObserver* observer) override;
   void RemoveActivationObserver(WmActivationObserver* observer) override;
   void AddDisplayObserver(WmDisplayObserver* observer) override;
   void RemoveDisplayObserver(WmDisplayObserver* observer) override;
-  void AddPointerWatcher(views::PointerWatcher* watcher) override;
+  void AddPointerWatcher(views::PointerWatcher* watcher,
+                         bool wants_moves) override;
   void RemovePointerWatcher(views::PointerWatcher* watcher) override;
   bool IsTouchDown() override;
 #if defined(OS_CHROMEOS)
   void ToggleIgnoreExternalKeyboard() override;
 #endif
 
  private:
   friend class WmShellMusTestApi;
 
   ui::WindowTreeClient* window_tree_client();
 
   // Returns true if |window| is a window that can have active children.
   static bool IsActivationParent(ui::Window* window);
 
   // ui::WindowTreeClientObserver:
   void OnWindowTreeFocusChanged(ui::Window* gained_focus,
                                 ui::Window* lost_focus) override;
   void OnDidDestroyClient(ui::WindowTreeClient* client) override;
 
   WindowManager* window_manager_;
 
+  views::PointerWatcherEventRouter* pointer_watcher_event_router_;
+
   std::vector<WmRootWindowControllerMus*> root_window_controllers_;
 
   std::unique_ptr<AcceleratorControllerDelegateMus>
       accelerator_controller_delegate_;
   std::unique_ptr<AcceleratorControllerRegistrar>
       accelerator_controller_registrar_;
   std::unique_ptr<SessionStateDelegate> session_state_delegate_;
 
   base::ObserverList<WmActivationObserver> activation_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShellMus);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_BRIDGE_WM_SHELL_MUS_H_