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 /ash/system/chromeos/power/power_event_observer.cc | |
| 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 'ash/system/chromeos/power/power_event_observer.cc')
| -rw-r--r-- | ash/system/chromeos/power/power_event_observer.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/chromeos/power/power_event_observer.cc b/ash/system/chromeos/power/power_event_observer.cc index 39965f2..42d67f9 100644 --- a/ash/system/chromeos/power/power_event_observer.cc +++ b/ash/system/chromeos/power/power_event_observer.cc @@ -8,10 +8,10 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" #include "ash/wm/power_button_controller.h" -#include "ash/wm/user_activity_detector.h" #include "base/prefs/pref_service.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "ui/display/chromeos/output_configurator.h" +#include "ui/wm/core/user_activity_detector.h" namespace ash { namespace internal { |