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

ash/system/chromeos/power/user_activity_notifier.h

Index: ash/system/chromeos/power/user_activity_notifier.h
diff --git a/ash/system/chromeos/power/user_activity_notifier.h b/ash/system/chromeos/power/user_activity_notifier.h
index 78b2c431144ef422f33f6d398689fb8e947c7cc9..4374304c438c86aad9a6768736ac05f487461ec7 100644
--- a/ash/system/chromeos/power/user_activity_notifier.h
+++ b/ash/system/chromeos/power/user_activity_notifier.h
@@ -5,28 +5,29 @@
 #ifndef ASH_SYSTEM_CHROMEOS_POWER_USER_ACTIVITY_NOTIFIER_H_
 #define ASH_SYSTEM_CHROMEOS_POWER_USER_ACTIVITY_NOTIFIER_H_
 
-#include "ash/wm/user_activity_observer.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
+#include "ui/wm/core/user_activity_observer.h"
 
-namespace ash {
-
+namespace wm {
 class UserActivityDetector;
+}  // namespace wm
 
+namespace ash {
 namespace internal {
 
 // Notifies the power manager when the user is active.
-class UserActivityNotifier : public UserActivityObserver {
+class UserActivityNotifier : public ::wm::UserActivityObserver {

[Daniel Erat, 2014/04/02 16:03:22]

i think that app_shell will want to use this class as well, but i'm not sure if
it makes sense to put chrome-os-specific code into ui/wm/core/. thoughts?

[sky, 2014/04/02 17:57:12]

I don't think we want chromeos specific code in ui/wm. If you do need it from
app_shell you'll have to move to some other place in ui/.

  public:
-  explicit UserActivityNotifier(UserActivityDetector* detector);
+  explicit UserActivityNotifier(::wm::UserActivityDetector* detector);
   virtual ~UserActivityNotifier();
 
   // UserActivityObserver implementation.
   virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
 
  private:
-  UserActivityDetector* detector_;  // not owned
+  ::wm::UserActivityDetector* detector_;  // not owned
 
   // Last time that the power manager was notified.
   base::TimeTicks last_notify_time_;