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}

35 files changed, 133 insertions, 135 deletions

diff --git a/ash/display/display_change_observer_chromeos.cc b/ash/display/display_change_observer_chromeos.cc
index 791279f..2a8c8bb 100644
--- a/ash/display/display_change_observer_chromeos.cc
+++ b/ash/display/display_change_observer_chromeos.cc
@@ -22,6 +22,7 @@
 #include "base/logging.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/display/types/display_mode.h"
 #include "ui/display/types/display_snapshot.h"
@@ -29,7 +30,6 @@
 #include "ui/events/devices/device_data_manager.h"
 #include "ui/events/devices/touchscreen_device.h"
 #include "ui/gfx/display.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace ash {
 
@@ -249,8 +249,8 @@ void DisplayChangeObserver::OnDisplayModeChanged(
 
   // For the purposes of user activity detection, ignore synthetic mouse events
   // that are triggered by screen resizes: http://crbug.com/360634
-  ::wm::UserActivityDetector* user_activity_detector =
-      ::wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* user_activity_detector =
+      ui::UserActivityDetector::Get();
   if (user_activity_detector)
     user_activity_detector->OnDisplayPowerChanging();
 }
diff --git a/ash/shell.cc b/ash/shell.cc
index 9062d81..96fc38c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -86,6 +86,7 @@
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/ui_base_switches.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/events/event_target_iterator.h"
@@ -109,7 +110,6 @@
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/nested_accelerator_controller.h"
 #include "ui/wm/core/shadow_controller.h"
-#include "ui/wm/core/user_activity_detector.h"
 #include "ui/wm/core/visibility_controller.h"
 #include "ui/wm/core/window_modality_controller.h"
 
@@ -914,9 +914,9 @@ void Shell::Init(const ShellInitParams& init_params) {
 
   // The order in which event filters are added is significant.
 
-  // wm::UserActivityDetector passes events to observers, so let them get
+  // ui::UserActivityDetector passes events to observers, so let them get
   // rewritten first.
-  user_activity_detector_.reset(new ::wm::UserActivityDetector);
+  user_activity_detector_.reset(new ui::UserActivityDetector);
   AddPreTargetHandler(user_activity_detector_.get());
 
   overlay_filter_.reset(new OverlayEventFilter);
diff --git a/ash/shell.h b/ash/shell.h
index 9850afe..c9f4eb0 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -57,6 +57,7 @@ class Rect;
 namespace ui {
 class DisplayConfigurator;
 class Layer;
+class UserActivityDetector;
 class UserActivityPowerManagerNotifier;
 }
 namespace views {
@@ -74,7 +75,6 @@ class InputMethodEventFilter;
 class NestedAcceleratorController;
 class ShadowController;
 class VisibilityController;
-class UserActivityDetector;
 class WindowModalityController;
 }
 
@@ -145,7 +145,6 @@ class SystemTrayNotifier;
 class ToplevelWindowEventHandler;
 class TouchTransformerController;
 class TouchObserverHUD;
-class UserActivityDetector;
 class UserWallpaperDelegate;
 class VirtualKeyboardController;
 class VideoActivityNotifier;
@@ -672,7 +671,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate,
   scoped_ptr<PowerButtonController> power_button_controller_;
   scoped_ptr<LockStateController> lock_state_controller_;
   scoped_ptr<MruWindowTracker> mru_window_tracker_;
-  scoped_ptr< ::wm::UserActivityDetector> user_activity_detector_;
+  scoped_ptr<ui::UserActivityDetector> user_activity_detector_;
   scoped_ptr<VideoDetector> video_detector_;
   scoped_ptr<WindowCycleController> window_cycle_controller_;
   scoped_ptr<WindowSelectorController> window_selector_controller_;
diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc
index 610094d..65567f4 100644
--- a/ash/system/chromeos/power/power_event_observer.cc
+++ b/ash/system/chromeos/power/power_event_observer.cc
@@ -10,8 +10,8 @@
 #include "ash/wm/power_button_controller.h"
 #include "base/prefs/pref_service.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/display/chromeos/display_configurator.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace ash {
 
@@ -50,7 +50,7 @@ void PowerEventObserver::SuspendImminent() {
         RequestLockScreen();
   }
 
-  wm::UserActivityDetector::Get()->OnDisplayPowerChanging();
+  ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
   shell->display_configurator()->SuspendDisplays();
 }
 
diff --git a/athena/env/DEPS b/athena/env/DEPS
index 82dec51..ebc1163 100644
--- a/athena/env/DEPS
+++ b/athena/env/DEPS
@@ -5,6 +5,7 @@ include_rules = [
   "+ui/chromeos",
   "+ui/display",
   "+ui/events/devices",
+  "+ui/events/user_activity",
   "+ui/gfx",
   "+ui/wm",
 ]
diff --git a/athena/env/athena_env_impl.cc b/athena/env/athena_env_impl.cc
index 6b5975d..58b8490 100644
--- a/athena/env/athena_env_impl.cc
+++ b/athena/env/athena_env_impl.cc
@@ -18,6 +18,7 @@
 #include "ui/aura/window_tree_host_observer.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/image_cursors.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/chromeos/user_activity_power_manager_notifier.h"
 #include "ui/display/chromeos/display_configurator.h"
 #include "ui/display/types/display_mode.h"
@@ -31,7 +32,6 @@
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace athena {
 
@@ -245,7 +245,7 @@ class AthenaEnvImpl : public AthenaEnv,
     cursor_manager_->SetCursor(ui::kCursorPointer);
     aura::client::SetCursorClient(host_->window(), cursor_manager_.get());
 
-    user_activity_detector_.reset(new wm::UserActivityDetector);
+    user_activity_detector_.reset(new ui::UserActivityDetector);
     host_->event_processor()->GetRootTarget()->AddPreTargetHandler(
         user_activity_detector_.get());
     user_activity_notifier_.reset(new ui::UserActivityPowerManagerNotifier(
@@ -395,7 +395,7 @@ class AthenaEnvImpl : public AthenaEnv,
   scoped_ptr<wm::CompoundEventFilter> root_window_event_filter_;
   scoped_ptr<aura::client::DefaultCaptureClient> capture_client_;
   scoped_ptr<wm::CursorManager> cursor_manager_;
-  scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
+  scoped_ptr<ui::UserActivityDetector> user_activity_detector_;
   scoped_ptr<ui::DisplayConfigurator> display_configurator_;
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 
diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc
index 7d9fe0f..857d48a 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc
+++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.cc
@@ -14,7 +14,7 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/user_manager/user_manager.h"
 #include "extensions/browser/extension_system.h"
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 namespace chromeos {
 
@@ -56,8 +56,8 @@ KioskModeIdleAppNameNotification::KioskModeIdleAppNameNotification()
 }
 
 KioskModeIdleAppNameNotification::~KioskModeIdleAppNameNotification() {
-  wm::UserActivityDetector* user_activity_detector =
-      wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* user_activity_detector =
+      ui::UserActivityDetector::Get();
   if (user_activity_detector && user_activity_detector->HasObserver(this)) {
     user_activity_detector->RemoveObserver(this);
     // At this time the DBusThreadManager might already be gone.
@@ -98,8 +98,8 @@ void KioskModeIdleAppNameNotification::SuspendDone(
 }
 
 void KioskModeIdleAppNameNotification::Start() {
-  if (!wm::UserActivityDetector::Get()->HasObserver(this)) {
-    wm::UserActivityDetector::Get()->AddObserver(this);
+  if (!ui::UserActivityDetector::Get()->HasObserver(this)) {
+    ui::UserActivityDetector::Get()->AddObserver(this);
     chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
         this);
   }
diff --git a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h
index 965e56d..abcdf1f 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification.h
@@ -10,12 +10,13 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "chromeos/dbus/power_manager_client.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 
 namespace chromeos {
+
 class IdleAppNameNotificationView;
 
-class KioskModeIdleAppNameNotification : public wm::UserActivityObserver,
+class KioskModeIdleAppNameNotification : public ui::UserActivityObserver,
                                          public PowerManagerClient::Observer {
  public:
   static void Initialize();
@@ -29,7 +30,7 @@ class KioskModeIdleAppNameNotification : public wm::UserActivityObserver,
   // Initialize idle app message when KioskModeHelper is initialized.
   void Setup();
 
-  // wm::UserActivityObserver overrides:
+  // ui::UserActivityObserver overrides:
   virtual void OnUserActivity(const ui::Event* event) override;
 
   // PowerManagerClient::Observer overrides:
diff --git a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc
index 8382874..9fc1718 100644
--- a/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc
+++ b/chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"
 
 #include "ash/shell.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/display/chromeos/display_configurator.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace chromeos {
 
@@ -24,7 +24,7 @@ void ChromeDisplayPowerServiceProviderDelegate::SetDisplayPower(
   // we suspend may trigger a mouse move, which would then be incorrectly
   // reported as user activity.  Let the UserActivityDetector
   // know so that it can ignore such events.
-  wm::UserActivityDetector::Get()->OnDisplayPowerChanging();
+  ui::UserActivityDetector::Get()->OnDisplayPowerChanging();
 
   ash::Shell::GetInstance()->display_configurator()->SetDisplayPower(
       power_state, ui::DisplayConfigurator::kSetDisplayPowerNoFlags);
diff --git a/chrome/browser/chromeos/idle_detector.cc b/chrome/browser/chromeos/idle_detector.cc
index e950791..8b9547f 100644
--- a/chrome/browser/chromeos/idle_detector.cc
+++ b/chrome/browser/chromeos/idle_detector.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 namespace chromeos {
 
@@ -14,8 +14,8 @@ IdleDetector::IdleDetector(const base::Closure& on_idle_callback)
     : idle_callback_(on_idle_callback) {}
 
 IdleDetector::~IdleDetector() {
-  wm::UserActivityDetector* user_activity_detector =
-      wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* user_activity_detector =
+      ui::UserActivityDetector::Get();
   if (user_activity_detector && user_activity_detector->HasObserver(this))
     user_activity_detector->RemoveObserver(this);
 }
@@ -26,8 +26,8 @@ void IdleDetector::OnUserActivity(const ui::Event* event) {
 
 void IdleDetector::Start(const base::TimeDelta& timeout) {
   timeout_ = timeout;
-  if (!wm::UserActivityDetector::Get()->HasObserver(this))
-    wm::UserActivityDetector::Get()->AddObserver(this);
+  if (!ui::UserActivityDetector::Get()->HasObserver(this))
+    ui::UserActivityDetector::Get()->AddObserver(this);
   ResetTimer();
 }
 
diff --git a/chrome/browser/chromeos/idle_detector.h b/chrome/browser/chromeos/idle_detector.h
index e2b74d3..fd59efd 100644
--- a/chrome/browser/chromeos/idle_detector.h
+++ b/chrome/browser/chromeos/idle_detector.h
@@ -10,11 +10,11 @@
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 
 namespace chromeos {
 
-class IdleDetector : public wm::UserActivityObserver {
+class IdleDetector : public ui::UserActivityObserver {
  public:
   explicit IdleDetector(const base::Closure& on_idle_callback);
   virtual ~IdleDetector();
@@ -22,7 +22,7 @@ class IdleDetector : public wm::UserActivityObserver {
   void Start(const base::TimeDelta& timeout);
 
  private:
-  // wm::UserActivityObserver overrides:
+  // ui::UserActivityObserver overrides:
   virtual void OnUserActivity(const ui::Event* event) override;
 
   // Resets |timer_| to fire when we reach our idle timeout.
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.cc b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
index d0ce95f..16cac17 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.cc
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.cc
@@ -23,7 +23,7 @@
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 namespace chromeos {
 
@@ -114,7 +114,7 @@ UserSelectionScreen::UserSelectionScreen(const std::string& display_type)
 
 UserSelectionScreen::~UserSelectionScreen() {
   ScreenlockBridge::Get()->SetLockHandler(nullptr);
-  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
 }
@@ -227,7 +227,7 @@ void UserSelectionScreen::Init(const user_manager::UserList& users,
   users_ = users;
   show_guest_ = show_guest;
 
-  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
   if (!activity_detector->HasObserver(this))
     activity_detector->AddObserver(this);
 }
diff --git a/chrome/browser/chromeos/login/screens/user_selection_screen.h b/chrome/browser/chromeos/login/screens/user_selection_screen.h
index 4426307..b89c9c3 100644
--- a/chrome/browser/chromeos/login/screens/user_selection_screen.h
+++ b/chrome/browser/chromeos/login/screens/user_selection_screen.h
@@ -16,7 +16,7 @@
 #include "chrome/browser/chromeos/login/ui/models/user_board_model.h"
 #include "chrome/browser/signin/screenlock_bridge.h"
 #include "components/user_manager/user.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 
 class EasyUnlockService;
 
@@ -26,7 +26,7 @@ class LoginDisplayWebUIHandler;
 class UserBoardView;
 
 // This class represents User Selection screen: user pod-based login screen.
-class UserSelectionScreen : public wm::UserActivityObserver,
+class UserSelectionScreen : public ui::UserActivityObserver,
                             public ScreenlockBridge::LockHandler,
                             public UserBoardModel {
  public:
@@ -53,7 +53,7 @@ class UserSelectionScreen : public wm::UserActivityObserver,
 
   void HandleGetUsers();
 
-  // wm::UserActivityDetector implementation:
+  // ui::UserActivityDetector implementation:
   virtual void OnUserActivity(const ui::Event* event) override;
 
   void InitEasyUnlock();
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.cc b/chrome/browser/chromeos/login/ui/webui_login_display.cc
index aaffe8a..32460d6f 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.cc
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.cc
@@ -21,8 +21,8 @@
 #include "ui/base/ime/chromeos/ime_keyboard.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/views/widget/widget.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 #if !defined(USE_ATHENA)
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
@@ -35,7 +35,7 @@ namespace chromeos {
 WebUILoginDisplay::~WebUILoginDisplay() {
   if (webui_handler_)
     webui_handler_->ResetSigninScreenHandlerDelegate();
-  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
   if (activity_detector->HasObserver(this))
     activity_detector->RemoveObserver(this);
 }
@@ -65,7 +65,7 @@ void WebUILoginDisplay::Init(const user_manager::UserList& users,
   show_users_ = show_users;
   show_new_user_ = show_new_user;
 
-  wm::UserActivityDetector* activity_detector = wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* activity_detector = ui::UserActivityDetector::Get();
   if (!activity_detector->HasObserver(this))
     activity_detector->AddObserver(this);
 }
diff --git a/chrome/browser/chromeos/login/ui/webui_login_display.h b/chrome/browser/chromeos/login/ui/webui_login_display.h
index 2a8d18b..4089aa7 100644
--- a/chrome/browser/chromeos/login/ui/webui_login_display.h
+++ b/chrome/browser/chromeos/login/ui/webui_login_display.h
@@ -14,15 +14,16 @@
 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "components/user_manager/user.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 #include "ui/views/widget/widget.h"
-#include "ui/wm/core/user_activity_observer.h"
 
 namespace chromeos {
+
 // WebUI-based login UI implementation.
 class WebUILoginDisplay : public LoginDisplay,
                           public NativeWindowDelegate,
                           public SigninScreenHandlerDelegate,
-                          public wm::UserActivityObserver {
+                          public ui::UserActivityObserver {
  public:
   explicit WebUILoginDisplay(LoginDisplay::Delegate* delegate);
   virtual ~WebUILoginDisplay();
@@ -80,7 +81,7 @@ class WebUILoginDisplay : public LoginDisplay,
   virtual void HandleGetUsers() override;
   virtual const user_manager::UserList& GetUsers() const override;
 
-  // wm::UserActivityDetector implementation:
+  // ui::UserActivityDetector implementation:
   virtual void OnUserActivity(const ui::Event* event) override;
 
  private:
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.cc b/chrome/browser/chromeos/policy/recommendation_restorer.cc
index 7dfcbd9..7cb2613 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer.cc
+++ b/chrome/browser/chromeos/policy/recommendation_restorer.cc
@@ -18,7 +18,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 namespace policy {
 
@@ -108,8 +108,8 @@ void RecommendationRestorer::Restore(bool allow_delay,
     allow_delay = false;
   } else if (allow_delay) {
     // Skip the delay if there has been no user input since the browser started.
-    const wm::UserActivityDetector* user_activity_detector =
-        wm::UserActivityDetector::Get();
+    const ui::UserActivityDetector* user_activity_detector =
+        ui::UserActivityDetector::Get();
     if (user_activity_detector &&
         user_activity_detector->last_activity_time().is_null()) {
       allow_delay = false;
@@ -135,8 +135,8 @@ void RecommendationRestorer::StartTimer() {
   // Listen for user activity so that the timer can be reset while the user is
   // active, causing it to fire only when the user remains idle for
   // |kRestoreDelayInMs|.
-  wm::UserActivityDetector* user_activity_detector =
-      wm::UserActivityDetector::Get();
+  ui::UserActivityDetector* user_activity_detector =
+      ui::UserActivityDetector::Get();
   if (user_activity_detector && !user_activity_detector->HasObserver(this))
     user_activity_detector->AddObserver(this);
 
@@ -156,8 +156,8 @@ void RecommendationRestorer::StartTimer() {
 
 void RecommendationRestorer::StopTimer() {
   restore_timer_.Stop();
-  if (wm::UserActivityDetector::Get())
-    wm::UserActivityDetector::Get()->RemoveObserver(this);
+  if (ui::UserActivityDetector::Get())
+    ui::UserActivityDetector::Get()->RemoveObserver(this);
 }
 
 }  // namespace policy
diff --git a/chrome/browser/chromeos/policy/recommendation_restorer.h b/chrome/browser/chromeos/policy/recommendation_restorer.h
index 4e96c60..6879d89 100644
--- a/chrome/browser/chromeos/policy/recommendation_restorer.h
+++ b/chrome/browser/chromeos/policy/recommendation_restorer.h
@@ -14,7 +14,7 @@
 #include "components/keyed_service/core/keyed_service.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 
 class Profile;
 
@@ -28,7 +28,7 @@ namespace policy {
 // becomes idle for one minute.
 class RecommendationRestorer : public KeyedService,
                                public content::NotificationObserver,
-                               public wm::UserActivityObserver {
+                               public ui::UserActivityObserver {
  public:
   explicit RecommendationRestorer(Profile* profile);
   virtual ~RecommendationRestorer();
@@ -41,7 +41,7 @@ class RecommendationRestorer : public KeyedService,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) override;
 
-  // wm::UserActivityObserver:
+  // ui::UserActivityObserver:
   virtual void OnUserActivity(const ui::Event* event) override;
 
   // If a recommended value and a user setting exist for |pref_name|, clears the
diff --git a/chrome/browser/chromeos/session_length_limiter.cc b/chrome/browser/chromeos/session_length_limiter.cc
index 1714982..136db60 100644
--- a/chrome/browser/chromeos/session_length_limiter.cc
+++ b/chrome/browser/chromeos/session_length_limiter.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/common/pref_names.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/events/event.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 namespace chromeos {
 
@@ -97,20 +97,20 @@ SessionLengthLimiter::SessionLengthLimiter(Delegate* delegate,
     UpdateSessionStartTime();
   }
 
-  if (!user_activity_seen_ && wm::UserActivityDetector::Get())
-    wm::UserActivityDetector::Get()->AddObserver(this);
+  if (!user_activity_seen_ && ui::UserActivityDetector::Get())
+    ui::UserActivityDetector::Get()->AddObserver(this);
 }
 
 SessionLengthLimiter::~SessionLengthLimiter() {
-  if (!user_activity_seen_ && wm::UserActivityDetector::Get())
-    wm::UserActivityDetector::Get()->RemoveObserver(this);
+  if (!user_activity_seen_ && ui::UserActivityDetector::Get())
+    ui::UserActivityDetector::Get()->RemoveObserver(this);
 }
 
 void SessionLengthLimiter::OnUserActivity(const ui::Event* event) {
   if (user_activity_seen_)
     return;
-  if (wm::UserActivityDetector::Get())
-    wm::UserActivityDetector::Get()->RemoveObserver(this);
+  if (ui::UserActivityDetector::Get())
+    ui::UserActivityDetector::Get()->RemoveObserver(this);
   user_activity_seen_ = true;
 
   PrefService* local_state = g_browser_process->local_state();
diff --git a/chrome/browser/chromeos/session_length_limiter.h b/chrome/browser/chromeos/session_length_limiter.h
index 133319d..f60907f 100644
--- a/chrome/browser/chromeos/session_length_limiter.h
+++ b/chrome/browser/chromeos/session_length_limiter.h
@@ -12,7 +12,7 @@
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 
 class PrefService;
 class PrefRegistrySimple;
@@ -21,7 +21,7 @@ namespace chromeos {
 
 // Enforces a session length limit by terminating the session when the limit is
 // reached.
-class SessionLengthLimiter : public wm::UserActivityObserver {
+class SessionLengthLimiter : public ui::UserActivityObserver {
  public:
   class Delegate {
    public:
@@ -37,7 +37,7 @@ class SessionLengthLimiter : public wm::UserActivityObserver {
   SessionLengthLimiter(Delegate* delegate, bool browser_restarted);
   virtual ~SessionLengthLimiter();
 
-  // wm::UserActivityObserver:
+  // ui::UserActivityObserver:
   virtual void OnUserActivity(const ui::Event* event) override;
 
  private:
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.cc b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
index 2e36a7b..c9e7f33 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.cc
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.cc
@@ -42,7 +42,7 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 namespace chromeos {
 namespace system {
@@ -174,8 +174,8 @@ AutomaticRebootManager::AutomaticRebootManager(
   // idle. Start listening for user activity to determine whether the user is
   // idle or not.
   if (!user_manager::UserManager::Get()->IsUserLoggedIn()) {
-    if (wm::UserActivityDetector::Get())
-      wm::UserActivityDetector::Get()->AddObserver(this);
+    if (ui::UserActivityDetector::Get())
+      ui::UserActivityDetector::Get()->AddObserver(this);
     notification_registrar_.Add(this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
         content::NotificationService::AllSources());
     login_screen_idle_timer_.reset(
@@ -207,8 +207,8 @@ AutomaticRebootManager::~AutomaticRebootManager() {
   DBusThreadManager* dbus_thread_manager = DBusThreadManager::Get();
   dbus_thread_manager->GetPowerManagerClient()->RemoveObserver(this);
   dbus_thread_manager->GetUpdateEngineClient()->RemoveObserver(this);
-  if (wm::UserActivityDetector::Get())
-    wm::UserActivityDetector::Get()->RemoveObserver(this);
+  if (ui::UserActivityDetector::Get())
+    ui::UserActivityDetector::Get()->RemoveObserver(this);
 }
 
 void AutomaticRebootManager::AddObserver(
@@ -275,8 +275,8 @@ void AutomaticRebootManager::Observe(
   } else if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
     // A session is starting. Stop listening for user activity as it no longer
     // is a relevant criterion.
-    if (wm::UserActivityDetector::Get())
-      wm::UserActivityDetector::Get()->RemoveObserver(this);
+    if (ui::UserActivityDetector::Get())
+      ui::UserActivityDetector::Get()->RemoveObserver(this);
     notification_registrar_.Remove(
         this, chrome::NOTIFICATION_LOGIN_USER_CHANGED,
         content::NotificationService::AllSources());
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h
index 5ecf8d6..00622dd 100644
--- a/chrome/browser/chromeos/system/automatic_reboot_manager.h
+++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h
@@ -18,7 +18,7 @@
 #include "chromeos/dbus/update_engine_client.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/wm/core/user_activity_observer.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 
 class PrefRegistrySimple;
 
@@ -71,7 +71,7 @@ namespace system {
 // /var/run ensures that it gets cleared automatically on every boot.
 class AutomaticRebootManager : public PowerManagerClient::Observer,
                                public UpdateEngineClient::Observer,
-                               public wm::UserActivityObserver,
+                               public ui::UserActivityObserver,
                                public content::NotificationObserver {
  public:
   // The current uptime and the uptime at which an update was applied and a
@@ -107,7 +107,7 @@ class AutomaticRebootManager : public PowerManagerClient::Observer,
   virtual void UpdateStatusChanged(
       const UpdateEngineClient::Status& status) override;
 
-  // wm::UserActivityObserver:
+  // ui::UserActivityObserver:
   virtual void OnUserActivity(const ui::Event* event) override;
 
   // content::NotificationObserver:
diff --git a/chrome/browser/idle_chromeos.cc b/chrome/browser/idle_chromeos.cc
index 96b058c..9505d05 100644
--- a/chrome/browser/idle_chromeos.cc
+++ b/chrome/browser/idle_chromeos.cc
@@ -7,11 +7,11 @@
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/time/time.h"
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 void CalculateIdleTime(IdleTimeCallback notify) {
   base::TimeDelta idle_time = base::TimeTicks::Now() -
-      wm::UserActivityDetector::Get()->last_activity_time();
+      ui::UserActivityDetector::Get()->last_activity_time();
   notify.Run(static_cast<int>(idle_time.InSeconds()));
 }
 
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.cc b/extensions/shell/browser/shell_desktop_controller_aura.cc
index c5fbd58..a3dcd6e 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura.cc
+++ b/extensions/shell/browser/shell_desktop_controller_aura.cc
@@ -24,6 +24,7 @@
 #include "ui/base/cursor/cursor.h"
 #include "ui/base/cursor/image_cursors.h"
 #include "ui/base/ime/input_method_initializer.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/screen.h"
@@ -34,7 +35,6 @@
 #include "ui/wm/core/input_method_event_filter.h"
 #include "ui/wm/core/native_cursor_manager.h"
 #include "ui/wm/core/native_cursor_manager_delegate.h"
-#include "ui/wm/core/user_activity_detector.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -278,7 +278,7 @@ void ShellDesktopControllerAura::InitWindowManager() {
   cursor_manager_->SetCursor(ui::kCursorPointer);
   aura::client::SetCursorClient(host_->window(), cursor_manager_.get());
 
-  user_activity_detector_.reset(new wm::UserActivityDetector);
+  user_activity_detector_.reset(new ui::UserActivityDetector);
   host_->event_processor()->GetRootTarget()->AddPreTargetHandler(
       user_activity_detector_.get());
 #if defined(OS_CHROMEOS)
diff --git a/extensions/shell/browser/shell_desktop_controller_aura.h b/extensions/shell/browser/shell_desktop_controller_aura.h
index d681cd4..5fcc058 100644
--- a/extensions/shell/browser/shell_desktop_controller_aura.h
+++ b/extensions/shell/browser/shell_desktop_controller_aura.h
@@ -36,17 +36,17 @@ namespace gfx {
 class Size;
 }
 
-#if defined(OS_CHROMEOS)
 namespace ui {
+class UserActivityDetector;
+#if defined(OS_CHROMEOS)
 class UserActivityPowerManagerNotifier;
-}
 #endif
+}
 
 namespace wm {
 class CompoundEventFilter;
 class CursorManager;
 class InputMethodEventFilter;
-class UserActivityDetector;
 }
 
 namespace extensions {
@@ -128,7 +128,7 @@ class ShellDesktopControllerAura
 
   scoped_ptr<wm::CursorManager> cursor_manager_;
 
-  scoped_ptr<wm::UserActivityDetector> user_activity_detector_;
+  scoped_ptr<ui::UserActivityDetector> user_activity_detector_;
 #if defined(OS_CHROMEOS)
   scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_;
 #endif
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index a40aa8b..6b034af 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -233,6 +233,9 @@ component("base") {
     "ui_base_switches_util.h",
     "ui_base_types.cc",
     "ui_base_types.h",
+    "user_activity/user_activity_detector.cc",
+    "user_activity/user_activity_detector.h",
+    "user_activity/user_activity_observer.h",
     "view_prop.cc",
     "view_prop.h",
     "webui/jstemplate_builder.cc",
@@ -741,8 +744,13 @@ test("ui_base_unittests") {
     "resource/resource_bundle_unittest.cc",
     "test/test_clipboard_unittest.cc",
     "test/run_all_unittests.cc",
+    "user_activity/user_activity_detector_unittest.cc",
   ]
 
+  if (is_android) {
+    sources -= [ "user_activity/user_activity_detector_unittest.cc" ]
+  }
+
   if (is_ios) {
     # Compile this Mac file on iOS as well.
     set_sources_assignment_filter([])
diff --git a/ui/base/ui_base.gyp b/ui/base/ui_base.gyp
index bb8d91f..1c8af2c 100644
--- a/ui/base/ui_base.gyp
+++ b/ui/base/ui_base.gyp
@@ -369,6 +369,9 @@
         'ui_base_switches_util.h',
         'ui_base_types.cc',
         'ui_base_types.h',
+        'user_activity/user_activity_detector.cc',
+        'user_activity/user_activity_detector.h',
+        'user_activity/user_activity_observer.h',
         'view_prop.cc',
         'view_prop.h',
         'webui/jstemplate_builder.cc',
diff --git a/ui/base/ui_base_tests.gyp b/ui/base/ui_base_tests.gyp
index a4c55ba..287761d 100644
--- a/ui/base/ui_base_tests.gyp
+++ b/ui/base/ui_base_tests.gyp
@@ -79,6 +79,7 @@
         'test/data/resource.h',
         'text/bytes_formatting_unittest.cc',
         'touch/selection_bound_unittest.cc',
+        'user_activity/user_activity_detector_unittest.cc',
         'view_prop_unittest.cc',
         'webui/web_ui_util_unittest.cc',
         'x/selection_requestor_unittest.cc',
@@ -143,6 +144,7 @@
           ],
           'sources!': [
             'touch/selection_bound_unittest.cc',
+            'user_activity/user_activity_detector_unittest.cc',
           ],
         }],
         ['use_pango == 1', {
diff --git a/ui/wm/core/user_activity_detector.cc b/ui/base/user_activity/user_activity_detector.cc
index a9f85e8..d6a4e43 100644
--- a/ui/wm/core/user_activity_detector.cc
+++ b/ui/base/user_activity/user_activity_detector.cc
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 #include "ui/events/event.h"
-#include "ui/wm/core/user_activity_observer.h"
 
-namespace wm {
+namespace ui {
 
 namespace {
 
@@ -120,4 +120,4 @@ void UserActivityDetector::HandleActivity(const ui::Event* event) {
   }
 }
 
-}  // namespace wm
+}  // namespace ui
diff --git a/ui/wm/core/user_activity_detector.h b/ui/base/user_activity/user_activity_detector.h
index 55ffc24..4984858 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_
diff --git a/ui/wm/core/user_activity_detector_unittest.cc b/ui/base/user_activity/user_activity_detector_unittest.cc
index 9f43c62..de76313 100644
--- a/ui/wm/core/user_activity_detector_unittest.cc
+++ b/ui/base/user_activity/user_activity_detector_unittest.cc
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/wm/core/user_activity_detector.h"
+#include "ui/base/user_activity/user_activity_detector.h"
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "ui/aura/test/aura_test_base.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/user_activity/user_activity_observer.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/geometry/point.h"
-#include "ui/wm/core/user_activity_observer.h"
 
-namespace wm {
+namespace ui {
 
 // Implementation that just counts the number of times we've been told that the
 // user is active.
@@ -35,24 +35,18 @@ class TestUserActivityObserver : public UserActivityObserver {
   DISALLOW_COPY_AND_ASSIGN(TestUserActivityObserver);
 };
 
-class UserActivityDetectorTest : public aura::test::AuraTestBase {
+class UserActivityDetectorTest : public testing::Test {
  public:
-  UserActivityDetectorTest() {}
-  ~UserActivityDetectorTest() override {}
-
-  void SetUp() override {
-    AuraTestBase::SetUp();
-    observer_.reset(new TestUserActivityObserver);
-    detector_.reset(new UserActivityDetector);
+  UserActivityDetectorTest()
+      : detector_(new UserActivityDetector),
+        observer_(new TestUserActivityObserver) {
     detector_->AddObserver(observer_.get());
-
     now_ = base::TimeTicks::Now();
     detector_->set_now_for_test(now_);
   }
 
-  void TearDown() override {
+  ~UserActivityDetectorTest() override {
     detector_->RemoveObserver(observer_.get());
-    AuraTestBase::TearDown();
   }
 
  protected:
@@ -197,4 +191,4 @@ TEST_F(UserActivityDetectorTest, IgnoreSyntheticMouseEvents) {
   EXPECT_EQ(0, observer_->num_invocations());
 }
 
-}  // namespace wm
+}  // namespace ui
diff --git a/ui/wm/core/user_activity_observer.h b/ui/base/user_activity/user_activity_observer.h
index 0fb35a6..7990cb8 100644
--- a/ui/wm/core/user_activity_observer.h
+++ b/ui/base/user_activity/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 UI_WM_CORE_USER_ACTIVITY_OBSERVER_H_
-#define UI_WM_CORE_USER_ACTIVITY_OBSERVER_H_
+#ifndef UI_BASE_USER_ACTIVITY_USER_ACTIVITY_OBSERVER_H_
+#define UI_BASE_USER_ACTIVITY_USER_ACTIVITY_OBSERVER_H_
 
 #include "base/basictypes.h"
-#include "ui/wm/wm_export.h"
+#include "ui/base/ui_base_export.h"
 
 namespace ui {
 class Event;
 }
 
-namespace wm {
+namespace ui {
 
 // Interface for classes that want to be notified about user activity.
 // Implementations should register themselves with UserActivityDetector.
-class WM_EXPORT UserActivityObserver {
+class UI_BASE_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 WM_EXPORT UserActivityObserver {
   DISALLOW_COPY_AND_ASSIGN(UserActivityObserver);
 };
 
-}  // namespace wm
+}  // namespace ui
 
-#endif  // UI_WM_CORE_USER_ACTIVITY_OBSERVER_H_
+#endif  // UI_BASE_USER_ACTIVITY_USER_ACTIVITY_OBSERVER_H_
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_;
diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
index 5a48324..ea50577 100644
--- a/ui/wm/BUILD.gn
+++ b/ui/wm/BUILD.gn
@@ -54,9 +54,6 @@ component("wm") {
     "core/transient_window_observer.h",
     "core/transient_window_stacking_client.cc",
     "core/transient_window_stacking_client.h",
-    "core/user_activity_detector.cc",
-    "core/user_activity_detector.h",
-    "core/user_activity_observer.h",
     "core/visibility_controller.cc",
     "core/visibility_controller.h",
     "core/window_animations.cc",
@@ -122,7 +119,6 @@ test("wm_unittests") {
     "core/shadow_controller_unittest.cc",
     "core/transient_window_manager_unittest.cc",
     "core/transient_window_stacking_client_unittest.cc",
-    "core/user_activity_detector_unittest.cc",
     "core/visibility_controller_unittest.cc",
     "core/window_animations_unittest.cc",
   ]
diff --git a/ui/wm/wm.gyp b/ui/wm/wm.gyp
index ad92d10..fa71587 100644
--- a/ui/wm/wm.gyp
+++ b/ui/wm/wm.gyp
@@ -81,9 +81,6 @@
         'core/transient_window_observer.h',
         'core/transient_window_stacking_client.cc',
         'core/transient_window_stacking_client.h',
-        'core/user_activity_detector.cc',
-        'core/user_activity_detector.h',
-        'core/user_activity_observer.h',
         'core/visibility_controller.cc',
         'core/visibility_controller.h',
         'core/window_animations.cc',
@@ -148,7 +145,6 @@
         'core/shadow_unittest.cc',
         'core/transient_window_manager_unittest.cc',
         'core/transient_window_stacking_client_unittest.cc',
-        'core/user_activity_detector_unittest.cc',
         'core/visibility_controller_unittest.cc',
         'core/window_animations_unittest.cc',
         'core/window_util_unittest.cc',