diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 12:50:57 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-16 12:50:57 +0000 |
| commit | b0fa7013cbff680457affbb6182f52d64ec7acee (patch) | |
| tree | 62a4a64a5def16d639ad0aba470408b62e4676c0 /ash/shell.cc | |
| parent | c2bfba59aac4f72b4fd0787d282379eeef9539af (diff) | |
| download | chromium_src-b0fa7013cbff680457affbb6182f52d64ec7acee.zip chromium_src-b0fa7013cbff680457affbb6182f52d64ec7acee.tar.gz chromium_src-b0fa7013cbff680457affbb6182f52d64ec7acee.tar.bz2 | |
Revert r264071 to reland r264067, "app_shell: Initialize chromeos::DBusThreadManager."
A build dependency got renamed while this was in the CQ.
BUG=354711
TBR=sky@chromium.org
Review URL: https://codereview.chromium.org/239843004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264184 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 6891419..2c0277f 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -132,7 +132,7 @@ #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/chromeos/user_activity_power_manager_notifier.h" #include "ui/display/chromeos/display_configurator.h" #endif // defined(OS_CHROMEOS) @@ -1001,7 +1001,7 @@ void Shell::Init() { power_event_observer_.reset(new PowerEventObserver()); user_activity_notifier_.reset( - new ui::UserActivityNotifier(user_activity_detector_.get())); + new ui::UserActivityPowerManagerNotifier(user_activity_detector_.get())); video_activity_notifier_.reset( new VideoActivityNotifier(video_detector_.get())); bluetooth_notification_controller_.reset(new BluetoothNotificationController); |