diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 01:40:16 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-10 01:40:16 +0000 |
| commit | 51625050bee35c77d3aca6dd3fefe48764809be3 (patch) | |
| tree | 9236ba6fa847ddaad33b61ba642ce269a5a5df94 /ash/shell.h | |
| parent | 8d351f1b326d0bdf9fe1aa300522f6d39a2fe528 (diff) | |
| download | chromium_src-51625050bee35c77d3aca6dd3fefe48764809be3.zip chromium_src-51625050bee35c77d3aca6dd3fefe48764809be3.tar.gz chromium_src-51625050bee35c77d3aca6dd3fefe48764809be3.tar.bz2 | |
chromeos: More power-related cleanup.
This consolidates SuspendObserver and ResumeObserver in a
PowerEventObserver class within ash/system/chromeos/power
and moves extension-related code into an
ExtensionSystemEventObserver class.
BUG=none
Review URL: https://codereview.chromium.org/26692002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227855 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 f04c511..a72826c 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -122,6 +122,7 @@ class LocaleNotificationController; class MouseCursorEventFilter; class OutputConfiguratorAnimation; class OverlayEventFilter; +class PowerEventObserver; class ResizeShadowController; class ResolutionNotificationController; class RootWindowController; @@ -129,7 +130,6 @@ class ScopedTargetRootWindow; class ScreenPositionController; class SlowAnimationEventFilter; class StatusAreaWidget; -class SuspendObserver; class SystemGestureEventFilter; class SystemModalContainerEventFilter; class TouchObserverHUD; @@ -626,7 +626,7 @@ class ASH_EXPORT Shell locale_notification_controller_; #if defined(OS_CHROMEOS) - scoped_ptr<internal::SuspendObserver> suspend_observer_; + scoped_ptr<internal::PowerEventObserver> power_event_observer_; scoped_ptr<internal::UserActivityNotifier> user_activity_notifier_; scoped_ptr<internal::VideoActivityNotifier> video_activity_notifier_; #if defined(USE_X11) |