Move UserActivityDetector from ash/wm/ to ui/wm/core/.

chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
index c35827760328f660cf969a16f5a1f17a3c6b8935..9f9c63fa6cf2bb04be27ca09f0962602b3583dbf 100644
--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h
@@ -5,16 +5,16 @@
 #ifndef CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_IDLE_LOGOUT_H_
 #define CHROME_BROWSER_CHROMEOS_KIOSK_MODE_KIOSK_MODE_IDLE_LOGOUT_H_
 
-#include "ash/wm/user_activity_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/timer/timer.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
+#include "ui/wm/core/user_activity_observer.h"
 
 namespace chromeos {
 
-class KioskModeIdleLogout : public ash::UserActivityObserver,
+class KioskModeIdleLogout : public wm::UserActivityObserver,
                             public content::NotificationObserver {
  public:
   static void Initialize();
@@ -33,7 +33,7 @@ class KioskModeIdleLogout : public ash::UserActivityObserver,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  // UserActivityObserver overrides:
+  // wm::UserActivityObserver overrides:
   virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
 
   // Begins listening for user activity and calls ResetTimer().