Convert TrayEventFilter to wm common types

ash/aura/wm_shell_aura.cc

Index: ash/aura/wm_shell_aura.cc
diff --git a/ash/aura/wm_shell_aura.cc b/ash/aura/wm_shell_aura.cc
index b888effd8915799baf53dc5e6c316249d0433268..3c82294a8dcb130b7b1e386127de38a892f61662 100644
--- a/ash/aura/wm_shell_aura.cc
+++ b/ash/aura/wm_shell_aura.cc
@@ -188,6 +188,22 @@ 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,
@@ -215,12 +231,4 @@ void WmShellAura::OnDisplayConfigurationChanged() {
                     OnDisplayConfigurationChanged());
 }
 
-#if defined(OS_CHROMEOS)
-void WmShellAura::ToggleIgnoreExternalKeyboard() {
-  Shell::GetInstance()
-      ->virtual_keyboard_controller()
-      ->ToggleIgnoreExternalKeyboard();
-}
-#endif
-
 }  // namespace ash