ash: Eliminate PointerWatcherDelegate

ash/aura/wm_shell_aura.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/aura/wm_shell_aura.h"
 
 #include <utility>
 
+#include "ash/aura/pointer_watcher_adapter.h"
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard.h"
 #include "ash/common/wm/mru_window_tracker.h"
 #include "ash/common/wm/overview/window_selector_controller.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/common/wm_display_observer.h"
 #include "ash/display/display_manager.h"
@@ skipping 29 matching lines @@
 
 WmShellAura::WmShellAura(std::unique_ptr<ShellDelegate> shell_delegate)
     : WmShell(std::move(shell_delegate)) {
   WmShell::Set(this);
 }
 
 WmShellAura::~WmShellAura() {
   WmShell::Set(nullptr);
 }
 
+void WmShellAura::CreatePointerWatcherAdapter() {
+  // Must occur after Shell has installed its early pre-target handlers (for
+  // example, WindowModalityController).
+  pointer_watcher_adapter_.reset(new PointerWatcherAdapter);
+}
+
 void WmShellAura::Shutdown() {
   if (added_activation_observer_)
     Shell::GetInstance()->activation_client()->RemoveObserver(this);
 
   if (added_display_observer_)
     Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
 
+  pointer_watcher_adapter_.reset();
+
   WmShell::Shutdown();
 }
 
 WmWindow* WmShellAura::NewContainerWindow() {
   aura::Window* aura_window = new aura::Window(nullptr);
   aura_window->Init(ui::LAYER_NOT_DRAWN);
   return WmWindowAura::Get(aura_window);
 }
 
 WmWindow* WmShellAura::GetFocusedWindow() {
@@ skipping 166 matching lines @@
   }
   display_observers_.AddObserver(observer);
 }
 
 void WmShellAura::RemoveDisplayObserver(WmDisplayObserver* observer) {
   display_observers_.RemoveObserver(observer);
 }
 
 void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher,
                                     bool wants_moves) {
-  Shell::GetInstance()->AddPointerWatcher(watcher, wants_moves);
+  pointer_watcher_adapter_->AddPointerWatcher(watcher, wants_moves);
 }
 
 void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) {
-  Shell::GetInstance()->RemovePointerWatcher(watcher);
+  pointer_watcher_adapter_->RemovePointerWatcher(watcher);
 }
 
 bool WmShellAura::IsTouchDown() {
   return aura::Env::GetInstance()->is_touch_down();
 }
 
 #if defined(OS_CHROMEOS)
 void WmShellAura::ToggleIgnoreExternalKeyboard() {
   Shell::GetInstance()
       ->virtual_keyboard_controller()
@@ skipping 25 matching lines @@
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanging());
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
 }  // namespace ash