Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7326)

Unified Diff: ash/shell.h

Issue 11091023: ash : Decouple power button controller and session state controller. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix power button cancel behaviour + unittest Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index 2f08927ccab2034a515ff1cb8a4bf41642431dee..33c0d7535fcd54ff5204ab98c7a710ac772db23d 100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -68,6 +68,7 @@ class Launcher;
class NestedDispatcherController;
class PowerButtonController;
class ScreenAsh;
+class SessionStateController;
class ShellDelegate;
class ShellObserver;
class SystemTrayDelegate;
@@ -273,6 +274,9 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
PowerButtonController* power_button_controller() {
return power_button_controller_.get();
}
+ SessionStateController* session_state_controller() {
+ return session_state_controller_.get();
+ }
UserActivityDetector* user_activity_detector() {
return user_activity_detector_.get();
}
@@ -444,6 +448,7 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate{
scoped_ptr<internal::VisibilityController> visibility_controller_;
scoped_ptr<DesktopBackgroundController> desktop_background_controller_;
scoped_ptr<PowerButtonController> power_button_controller_;
+ scoped_ptr<SessionStateController> session_state_controller_;
scoped_ptr<UserActivityDetector> user_activity_detector_;
scoped_ptr<VideoDetector> video_detector_;
scoped_ptr<WindowCycleController> window_cycle_controller_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698