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

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: Post-review fixes 2 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') | ash/wm/session_state_controller.h » ('J')
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 044ba06d5c4d6ba79b2fd7d444aa21cf44810819..41b7ff81e9c50b1bf99e2a9f128a18150b5487c5 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;
@@ -269,6 +270,9 @@ class ASH_EXPORT Shell : CursorDelegate,
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();
}
@@ -448,6 +452,7 @@ class ASH_EXPORT Shell : CursorDelegate,
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') | ash/wm/session_state_controller.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698