Move UserActivityDetector to ui/base/user_activity/.

ui/base/user_activity/user_activity_detector.h

Index: ui/base/user_activity/user_activity_detector.h
diff --git a/ui/wm/core/user_activity_detector.h b/ui/base/user_activity/user_activity_detector.h
similarity index 89%
rename from ui/wm/core/user_activity_detector.h
rename to ui/base/user_activity/user_activity_detector.h
index 55ffc24d4b96b4f3da68f0f96791e218186fcab5..498485879bce7ac68332f521841ee0e0b3c27011 100644
--- a/ui/wm/core/user_activity_detector.h
+++ b/ui/base/user_activity/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 UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_
-#define UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_
+#ifndef UI_BASE_USER_ACTIVITY_USER_ACTIVITY_DETECTOR_H_
+#define UI_BASE_USER_ACTIVITY_USER_ACTIVITY_DETECTOR_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
+#include "ui/base/ui_base_export.h"
 #include "ui/events/event_handler.h"
-#include "ui/wm/wm_export.h"
 
-namespace wm {
+namespace ui {
 
 class UserActivityObserver;
 
 // Watches for input events and notifies observers that the user is active.
-class WM_EXPORT UserActivityDetector : public ui::EventHandler {
+class UI_BASE_EXPORT UserActivityDetector : public ui::EventHandler {
  public:
   // Minimum amount of time between notifications to observers.
   static const int kNotifyIntervalMs;
@@ -79,6 +79,6 @@ class WM_EXPORT UserActivityDetector : public ui::EventHandler {
   DISALLOW_COPY_AND_ASSIGN(UserActivityDetector);
 };
 
-}  // namespace wm
+}  // namespace ui
 
-#endif  // UI_WM_CORE_USER_ACTIVITY_DETECTOR_H_
+#endif  // UI_BASE_USER_ACTIVITY_USER_ACTIVITY_DETECTOR_H_