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

ui/wm/core/user_activity_detector.h

Index: ui/wm/core/user_activity_detector.h
diff --git a/ash/wm/user_activity_detector.h b/ui/wm/core/user_activity_detector.h
similarity index 90%
rename from ash/wm/user_activity_detector.h
rename to ui/wm/core/user_activity_detector.h
index 1140c3d91964ffa2da3c17a1fb464d8a6db3e338..db198ed1cc7b2e491db3611d09826b5dda279140 100644
--- a/ash/wm/user_activity_detector.h
+++ b/ui/wm/core/user_activity_detector.h
@@ -2,22 +2,22 @@
 // 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_DETECTOR_H_
-#define ASH_WM_USER_ACTIVITY_DETECTOR_H_
+#ifndef UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_
+#define UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_
 
-#include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "ui/events/event_handler.h"
+#include "ui/wm/core/wm_core_export.h"
 
-namespace ash {
+namespace wm {
 
 class UserActivityObserver;
 
 // Watches for input events and notifies observers that the user is active.
-class ASH_EXPORT UserActivityDetector : public ui::EventHandler {
+class WM_CORE_EXPORT UserActivityDetector : public ui::EventHandler {
  public:
   // Minimum amount of time between notifications to observers.
   static const int kNotifyIntervalMs;
@@ -76,6 +76,6 @@ class ASH_EXPORT UserActivityDetector : public ui::EventHandler {
   DISALLOW_COPY_AND_ASSIGN(UserActivityDetector);
 };
 
-}  // namespace ash
+}  // namespace wm
 
-#endif  // ASH_WM_USER_ACTIVITY_DETECTOR_H_
+#endif  // UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_