Chromium Code Reviews| Index: ash/common/wm_shell.h |
| diff --git a/ash/common/wm_shell.h b/ash/common/wm_shell.h |
| index b7adf68b69edb12a1230eb3f5a131ec648ae1cdd..7aa7306f692a5e523e9cf7f913a591e40ed9099c 100644 |
| --- a/ash/common/wm_shell.h |
| +++ b/ash/common/wm_shell.h |
| @@ -55,6 +55,7 @@ class MaximizeModeController; |
| class MruWindowTracker; |
| class PaletteDelegate; |
| class ScopedDisableInternalMouseAndKeyboard; |
| +class SessionController; |
| class SessionStateDelegate; |
| class ShelfController; |
| class ShelfDelegate; |
| @@ -191,6 +192,8 @@ class ASH_EXPORT WmShell { |
| return window_selector_controller_.get(); |
| } |
| + SessionController* session_controller() { return session_controller_.get(); } |
| + |
| // Returns true when ash is running as a service_manager::Service. |
| virtual bool IsRunningInMash() const = 0; |
| @@ -503,6 +506,7 @@ class ASH_EXPORT WmShell { |
| std::unique_ptr<WindowCycleController> window_cycle_controller_; |
| std::unique_ptr<WindowSelectorController> window_selector_controller_; |
| std::unique_ptr<ui::devtools::UiDevToolsServer> devtools_server_; |
| + std::unique_ptr<SessionController> session_controller_; |
|
James Cook
2016/12/01 23:01:43
super nit: alphabetize, unless construction order
xiyuan
2016/12/06 00:46:34
Done.
|
| base::ObserverList<LockStateObserver> lock_state_observers_; |