diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 01:45:23 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-09 01:45:23 +0000 |
| commit | 960df013bd7cd5ddedfde766ce27efdaf614a9b2 (patch) | |
| tree | 01ca1917dcca4ad3e48535a90071cb2828aaf0eb /ash/shell.cc | |
| parent | 3c22115853db9af9bba693e9a6d547f0a391e292 (diff) | |
| download | chromium_src-960df013bd7cd5ddedfde766ce27efdaf614a9b2.zip chromium_src-960df013bd7cd5ddedfde766ce27efdaf614a9b2.tar.gz chromium_src-960df013bd7cd5ddedfde766ce27efdaf614a9b2.tar.bz2 | |
Move UserActivityNotifier from ash/ to ui/chromeos/.
This will allow the class to be shared by app_shell.
BUG=354711
Review URL: https://codereview.chromium.org/226223008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index eea3bff..4617a19 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -128,12 +128,12 @@ #include "ash/system/chromeos/brightness/brightness_controller_chromeos.h" #include "ash/system/chromeos/power/power_event_observer.h" #include "ash/system/chromeos/power/power_status.h" -#include "ash/system/chromeos/power/user_activity_notifier.h" #include "ash/system/chromeos/power/video_activity_notifier.h" #include "ash/system/chromeos/session/last_window_closed_logout_reminder.h" #include "ash/system/chromeos/session/logout_confirmation_controller.h" #include "base/bind_helpers.h" #include "base/sys_info.h" +#include "ui/chromeos/user_activity_notifier.h" #include "ui/display/chromeos/display_configurator.h" #endif // defined(OS_CHROMEOS) @@ -1003,7 +1003,7 @@ void Shell::Init() { power_event_observer_.reset(new PowerEventObserver()); user_activity_notifier_.reset( - new UserActivityNotifier(user_activity_detector_.get())); + new ui::UserActivityNotifier(user_activity_detector_.get())); video_activity_notifier_.reset( new VideoActivityNotifier(video_detector_.get())); bluetooth_notification_controller_.reset(new BluetoothNotificationController); |