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

ui/wm/core/user_activity_observer.h

Index: ui/wm/core/user_activity_observer.h
diff --git a/ash/wm/user_activity_observer.h b/ui/wm/core/user_activity_observer.h
similarity index 75%
rename from ash/wm/user_activity_observer.h
rename to ui/wm/core/user_activity_observer.h
index a65ebfa9667ca7501406dd216b754433f5bc6392..18e253db9054639bab7c28827f36daa4d4e25a89 100644
--- a/ash/wm/user_activity_observer.h
+++ b/ui/wm/core/user_activity_observer.h
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_USER_ACTIVITY_OBSERVER_H_
-#define ASH_WM_USER_ACTIVITY_OBSERVER_H_
+#ifndef UI_WM_CORE_USER_ACTIVITY_OBSERVER_H_
+#define UI_WM_CORE_USER_ACTIVITY_OBSERVER_H_
 
-#include "ash/ash_export.h"
 #include "base/basictypes.h"
+#include "ui/wm/core/wm_core_export.h"
 
 namespace ui {
 class Event;
 }
 
-namespace ash {
+namespace wm {
 
 // Interface for classes that want to be notified about user activity.
 // Implementations should register themselves with UserActivityDetector.
-class ASH_EXPORT UserActivityObserver {
+class WM_CORE_EXPORT UserActivityObserver {
  public:
   // Invoked periodically while the user is active (i.e. generating input
   // events). |event| is the event that triggered the notification; it may
@@ -30,6 +30,6 @@ class ASH_EXPORT UserActivityObserver {
   DISALLOW_COPY_AND_ASSIGN(UserActivityObserver);
 };
 
-}  // namespace ash
+}  // namespace wm
 
-#endif  // ASH_WM_USER_ACTIVITY_OBSERVER_H_
+#endif  // UI_WM_CORE_USER_ACTIVITY_OBSERVER_H_