Chromium Code Reviews| Index: ash/shell.h |
| diff --git a/ash/shell.h b/ash/shell.h |
| index 044ba06d5c4d6ba79b2fd7d444aa21cf44810819..9dc8db60d847c10c0eb1cd9723ed83e5992fc077 100644 |
| --- a/ash/shell.h |
| +++ b/ash/shell.h |
| @@ -67,6 +67,7 @@ class HighContrastController; |
| class Launcher; |
| class NestedDispatcherController; |
| class PowerButtonController; |
| +class SessionStateController; |
|
Daniel Erat
2012/10/11 15:08:30
nit: fix alphabetization
Denis Kuznetsov (DE-MUC)
2012/10/11 16:14:38
Done.
|
| class ScreenAsh; |
| class ShellDelegate; |
| class ShellObserver; |
| @@ -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_; |