diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 15:11:49 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 15:11:49 +0000 |
| commit | f0f612384a608b0e3e6a54283a19f622a4aebaf3 (patch) | |
| tree | 879fadfb2105aedf967412d1f70f8d00d369a091 /chrome/browser/chromeos/system/automatic_reboot_manager.h | |
| parent | 26585bd758df57dcd627d73cc7a8a87cb3bd3569 (diff) | |
| download | chromium_src-f0f612384a608b0e3e6a54283a19f622a4aebaf3.zip chromium_src-f0f612384a608b0e3e6a54283a19f622a4aebaf3.tar.gz chromium_src-f0f612384a608b0e3e6a54283a19f622a4aebaf3.tar.bz2 | |
Move UserActivityDetector from ash/wm/ to ui/wm/core/.
This code is dependent on aura but not on ash. It'd be
useful in app_shell, which doesn't use ash.
BUG=354711
Review URL: https://codereview.chromium.org/222383002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/system/automatic_reboot_manager.h')
| -rw-r--r-- | chrome/browser/chromeos/system/automatic_reboot_manager.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager.h b/chrome/browser/chromeos/system/automatic_reboot_manager.h index 83e5398..6e1adb5 100644 --- a/chrome/browser/chromeos/system/automatic_reboot_manager.h +++ b/chrome/browser/chromeos/system/automatic_reboot_manager.h @@ -5,7 +5,6 @@ #ifndef CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_ #define CHROME_BROWSER_CHROMEOS_SYSTEM_AUTOMATIC_REBOOT_MANAGER_H_ -#include "ash/wm/user_activity_observer.h" #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" @@ -18,6 +17,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" class PrefRegistrySimple; @@ -72,7 +72,7 @@ class AutomaticRebootManagerObserver; // /var/run ensures that it gets cleared automatically on every boot. class AutomaticRebootManager : public PowerManagerClient::Observer, public UpdateEngineClient::Observer, - public ash::UserActivityObserver, + public wm::UserActivityObserver, public content::NotificationObserver { public: // The current uptime and the uptime at which an update was applied and a @@ -103,7 +103,7 @@ class AutomaticRebootManager : public PowerManagerClient::Observer, virtual void UpdateStatusChanged( const UpdateEngineClient::Status& status) OVERRIDE; - // ash::UserActivityObserver: + // wm::UserActivityObserver: virtual void OnUserActivity(const ui::Event* event) OVERRIDE; // content::NotificationObserver: |