summaryrefslogtreecommitdiffstats
path: root/ash/shell.h
diff options
context:
space:
mode:
authorderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 21:51:11 +0000
committerderat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-06 21:51:11 +0000
commitc16b94299932734dda3c829d0eb21b743caabea2 (patch)
treee0aa8f21af5955b36f42c6c0656dede8c7510960 /ash/shell.h
parentdbbe276bb83d1ee19e652c877e84ce87a7171393 (diff)
downloadchromium_src-c16b94299932734dda3c829d0eb21b743caabea2.zip
chromium_src-c16b94299932734dda3c829d0eb21b743caabea2.tar.gz
chromium_src-c16b94299932734dda3c829d0eb21b743caabea2.tar.bz2
chromeos: Notify power manager about user activity.
This makes Chrome call powerd's HandleUserActivity D-Bus method in response to input events (but no more often than once every five seconds). BUG=chromium-os:31351 TEST=manual: tailed powerd's log and saw that it's receiving HandleUserActivity calls every five seconds as i type or move the mouse Review URL: https://chromiumcodereview.appspot.com/10544011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
-rw-r--r--ash/shell.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/shell.h b/ash/shell.h
index d73d85c..b470705 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -70,6 +70,7 @@ class ShellDelegate;
class ShellObserver;
class SystemTrayDelegate;
class SystemTray;
+class UserActivityDetector;
class UserWallpaperDelegate;
class VideoDetector;
class WindowCycleController;
@@ -248,6 +249,9 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
PowerButtonController* power_button_controller() {
return power_button_controller_.get();
}
+ UserActivityDetector* user_activity_detector() {
+ return user_activity_detector_.get();
+ }
VideoDetector* video_detector() {
return video_detector_.get();
}
@@ -396,6 +400,7 @@ class ASH_EXPORT Shell : aura::CursorDelegate {
scoped_ptr<internal::VisibilityController> visibility_controller_;
scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
scoped_ptr<PowerButtonController> power_button_controller_;
+ scoped_ptr<UserActivityDetector> user_activity_detector_;
scoped_ptr<VideoDetector> video_detector_;
scoped_ptr<WindowCycleController> window_cycle_controller_;
scoped_ptr<internal::FocusCycler> focus_cycler_;