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.h | |
| 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.h')
| -rw-r--r-- | ash/shell.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shell.h b/ash/shell.h index 56af8d1..90746c8 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -51,7 +51,7 @@ class Rect; namespace ui { class DisplayConfigurator; class Layer; -class UserActivityNotifier; +class UserActivityPowerManagerNotifier; } namespace views { class NonClientFrameView; @@ -689,7 +689,7 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, #if defined(OS_CHROMEOS) scoped_ptr<PowerEventObserver> power_event_observer_; - scoped_ptr<ui::UserActivityNotifier> user_activity_notifier_; + scoped_ptr<ui::UserActivityPowerManagerNotifier> user_activity_notifier_; scoped_ptr<VideoActivityNotifier> video_activity_notifier_; scoped_ptr<StickyKeysController> sticky_keys_controller_; scoped_ptr<ResolutionNotificationController> |