Wires up WmShellMus::Add/RemovePointerWatcher

ash/mus/bridge/wm_shell_mus.cc

 // 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.
 
 #include "ash/mus/bridge/wm_shell_mus.h"
 
 #include <utility>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/display/display_info.h"
@@ skipping 17 matching lines @@
 #include "ash/mus/container_ids.h"
 #include "ash/mus/drag_window_resizer.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/window_manager.h"
 #include "base/memory/ptr_util.h"
 #include "components/user_manager/user_info_impl.h"
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/display/screen.h"
+#include "ui/views/mus/pointer_watcher_event_router.h"
 
 namespace ash {
 namespace mus {
 
 namespace {
 
 // TODO(jamescook): After ShellDelegate is ported to ash/common use
 // ShellDelegate::CreateSessionStateDelegate() to construct the mus version
 // of SessionStateDelegate.
 class SessionStateDelegateStub : public SessionStateDelegate {
@@ skipping 47 matching lines @@
   bool screen_locked_;
 
   // A pseudo user info.
   std::unique_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
-WmShellMus::WmShellMus(std::unique_ptr<ShellDelegate> shell_delegate,
-                       WindowManager* window_manager)
+WmShellMus::WmShellMus(
+    std::unique_ptr<ShellDelegate> shell_delegate,
+    WindowManager* window_manager,
+    views::PointerWatcherEventRouter* pointer_watcher_event_router)
     : WmShell(std::move(shell_delegate)),
       window_manager_(window_manager),
+      pointer_watcher_event_router_(pointer_watcher_event_router),
       session_state_delegate_(new SessionStateDelegateStub) {
   window_tree_client()->AddObserver(this);
   WmShell::Set(this);
 
   uint16_t accelerator_namespace_id = 0u;
   const bool add_result =
       window_manager->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
   // WmShellMus is created early on, so that this should always succeed.
   DCHECK(add_result);
   accelerator_controller_delegate_.reset(new AcceleratorControllerDelegateMus);
@@ skipping 231 matching lines @@
 }
 
 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) {
   NOTIMPLEMENTED();
 }
 
-void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) {
-  // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
-  NOTIMPLEMENTED();
+void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher,
+                                   bool wants_moves) {
+  pointer_watcher_event_router_->AddPointerWatcher(watcher, wants_moves);
 }
 
 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
-  NOTIMPLEMENTED();
+  pointer_watcher_event_router_->RemovePointerWatcher(watcher);
 }
 
 bool WmShellMus::IsTouchDown() {
   // TODO: implement me, http://crbug.com/634967.
   // NOTIMPLEMENTED is too spammy here.
   return false;
 }
 
 #if defined(OS_CHROMEOS)
 void WmShellMus::ToggleIgnoreExternalKeyboard() {
@@ skipping 26 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) {
   DCHECK_EQ(window_tree_client(), client);
   client->RemoveObserver(this);
 }
 
 }  // namespace mus
 }  // namespace ash