Convert TrayEventFilter to wm common types

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 "ash/aura/wm_window_aura.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/mru_window_tracker.h"
@@ skipping 170 matching lines @@
 }
 
 void WmShellAura::AddShellObserver(ShellObserver* observer) {
   wm_shell_common_->AddShellObserver(observer);
 }
 
 void WmShellAura::RemoveShellObserver(ShellObserver* observer) {
   wm_shell_common_->RemoveShellObserver(observer);
 }
 
+void WmShellAura::AddPointerWatcher(views::PointerWatcher* watcher) {
+  Shell::GetInstance()->AddPointerWatcher(watcher);
+}
+
+void WmShellAura::RemovePointerWatcher(views::PointerWatcher* watcher) {
+  Shell::GetInstance()->RemovePointerWatcher(watcher);
+}
+
+#if defined(OS_CHROMEOS)
+void WmShellAura::ToggleIgnoreExternalKeyboard() {
+  Shell::GetInstance()
+      ->virtual_keyboard_controller()
+      ->ToggleIgnoreExternalKeyboard();
+}
+#endif
+
 void WmShellAura::OnWindowActivated(
     aura::client::ActivationChangeObserver::ActivationReason reason,
     aura::Window* gained_active,
     aura::Window* lost_active) {
   FOR_EACH_OBSERVER(WmActivationObserver, activation_observers_,
                     OnWindowActivated(WmWindowAura::Get(gained_active),
                                       WmWindowAura::Get(lost_active)));
 }
 
 void WmShellAura::OnAttemptToReactivateWindow(aura::Window* request_active,
                                               aura::Window* actual_active) {
   FOR_EACH_OBSERVER(
       WmActivationObserver, activation_observers_,
       OnAttemptToReactivateWindow(WmWindowAura::Get(request_active),
                                   WmWindowAura::Get(actual_active)));
 }
 
 void WmShellAura::OnDisplayConfigurationChanging() {
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanging());
 }
 
 void WmShellAura::OnDisplayConfigurationChanged() {
   FOR_EACH_OBSERVER(WmDisplayObserver, display_observers_,
                     OnDisplayConfigurationChanged());
 }
 
-#if defined(OS_CHROMEOS)
-void WmShellAura::ToggleIgnoreExternalKeyboard() {
-  Shell::GetInstance()
-      ->virtual_keyboard_controller()
-      ->ToggleIgnoreExternalKeyboard();
-}
-#endif
-
 }  // namespace ash