ash: Remove wm::GetRootWindowController.

ash/wm/user_activity_detector.cc

Index: ash/wm/user_activity_detector.cc
diff --git a/ash/wm/user_activity_detector.cc b/ash/wm/user_activity_detector.cc
index d11d171d4935011e9db963a85432216bc3ae2e82..3fd845a5fdcca6a822ada94d2cf8ade7a221e2de 100644
--- a/ash/wm/user_activity_detector.cc
+++ b/ash/wm/user_activity_detector.cc
@@ -4,6 +4,7 @@
 
 #include "ash/wm/user_activity_detector.h"
 
+#include "ash/wm/property_util.h"
 #include "ash/wm/user_activity_observer.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/event.h"
@@ -31,7 +32,7 @@ bool UserActivityDetector::PreHandleKeyEvent(aura::Window* target,
                                              aura::KeyEvent* event) {
   // Ignore input events on secondary displays in non extended desktop
   // mode.  Remove this once this mode is gone. crbug.com/135245.
-  if (!wm::GetRootWindowController(target->GetRootWindow()))
+  if (!GetRootWindowController(target->GetRootWindow()))
     return true;
   MaybeNotify();
   return false;
@@ -39,7 +40,7 @@ bool UserActivityDetector::PreHandleKeyEvent(aura::Window* target,
 
 bool UserActivityDetector::PreHandleMouseEvent(aura::Window* target,
                                                aura::MouseEvent* event) {
-  if (!wm::GetRootWindowController(target->GetRootWindow()))
+  if (!GetRootWindowController(target->GetRootWindow()))
     return true;
   if (!(event->flags() & ui::EF_IS_SYNTHESIZED))
     MaybeNotify();
@@ -49,7 +50,7 @@ bool UserActivityDetector::PreHandleMouseEvent(aura::Window* target,
 ui::TouchStatus UserActivityDetector::PreHandleTouchEvent(
     aura::Window* target,
     aura::TouchEvent* event) {
-  if (!wm::GetRootWindowController(target->GetRootWindow()))
+  if (!GetRootWindowController(target->GetRootWindow()))
     return ui::TOUCH_STATUS_END;
   MaybeNotify();
   return ui::TOUCH_STATUS_UNKNOWN;
@@ -58,7 +59,7 @@ ui::TouchStatus UserActivityDetector::PreHandleTouchEvent(
 ui::GestureStatus UserActivityDetector::PreHandleGestureEvent(
     aura::Window* target,
     aura::GestureEvent* event) {
-  if (!wm::GetRootWindowController(target->GetRootWindow()))
+  if (!GetRootWindowController(target->GetRootWindow()))
     return ui::GESTURE_STATUS_CONSUMED;
   MaybeNotify();
   return ui::GESTURE_STATUS_UNKNOWN;