Move UserActivityDetector to ui/base/user_activity/.

Move UserActivityDetector and UserActivityObserver out of
ui/wm/core/ so that other classes in ui/base/ can depend on
them. This is needed in order to be able to later move
chrome/browser/idle_chromeos.cc out of chrome/ so that the
chrome.idle API can eventually be moved to extensions/.

BUG=446320

Review URL: https://codereview.chromium.org/833893003

Cr-Commit-Position: refs/heads/master@{#310773}

2 files changed, 8 insertions, 11 deletions

diff --git a/ui/chromeos/user_activity_power_manager_notifier.cc b/ui/chromeos/user_activity_power_manager_notifier.cc
index 7952b59..fb2f671 100644
--- a/ui/chromeos/user_activity_power_manager_notifier.cc
+++ b/ui/chromeos/user_activity_power_manager_notifier.cc
@@ -6,10 +6,10 @@
 
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes_posix.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace ui {
 namespace {
@@ -42,7 +42,7 @@ power_manager::UserActivityType GetUserActivityTypeForEvent(
 }  // namespace
 
 UserActivityPowerManagerNotifier::UserActivityPowerManagerNotifier(
-    ::wm::UserActivityDetector* detector)
+    UserActivityDetector* detector)
     : detector_(detector) {
   detector_->AddObserver(this);
 }
diff --git a/ui/chromeos/user_activity_power_manager_notifier.h b/ui/chromeos/user_activity_power_manager_notifier.h
index 47cbcf9..0d3e4e2 100644
--- a/ui/chromeos/user_activity_power_manager_notifier.h
+++ b/ui/chromeos/user_activity_power_manager_notifier.h
@@ -8,28 +8,25 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 #include "ui/chromeos/ui_chromeos_export.h"
-#include "ui/wm/core/user_activity_observer.h"
-
-namespace wm {
-class UserActivityDetector;
-}  // namespace wm
 
 namespace ui {
 
+class UserActivityDetector;
+
 // Notifies the power manager when the user is active.
 class UI_CHROMEOS_EXPORT UserActivityPowerManagerNotifier
-    : public ::wm::UserActivityObserver {
+    : public UserActivityObserver {
  public:
-  explicit UserActivityPowerManagerNotifier(
-      ::wm::UserActivityDetector* detector);
+  explicit UserActivityPowerManagerNotifier(UserActivityDetector* detector);
   virtual ~UserActivityPowerManagerNotifier();
 
   // UserActivityObserver implementation.
   virtual void OnUserActivity(const Event* event) override;
 
  private:
-  ::wm::UserActivityDetector* detector_;  // not owned
+  UserActivityDetector* detector_;  // not owned
 
   // Last time that the power manager was notified.
   base::TimeTicks last_notify_time_;