diff options
| author | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 16:27:53 +0000 |
|---|---|---|
| committer | antrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-16 16:27:53 +0000 |
| commit | 81b9ab27d60b4645099c14e6a45eb66a59c5137e (patch) | |
| tree | 982200e57fbfdc83dac68ba172df29a9eba4ee68 /ash/shell.cc | |
| parent | 98e48e9b2c78c48bd8a2193587be9248b9fa04c1 (diff) | |
| download | chromium_src-81b9ab27d60b4645099c14e6a45eb66a59c5137e.zip chromium_src-81b9ab27d60b4645099c14e6a45eb66a59c5137e.tar.gz chromium_src-81b9ab27d60b4645099c14e6a45eb66a59c5137e.tar.bz2 | |
ash : Decouple power button controller and session state controller.
Prepare code to introduce two versions of SessionStateController later.
BUG=138171, 139461
Review URL: https://chromiumcodereview.appspot.com/11091023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162140 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.cc')
| -rw-r--r-- | ash/shell.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 3584a2f..aa2591a 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -46,6 +46,7 @@ #include "ash/wm/resize_shadow_controller.h" #include "ash/wm/root_window_layout_manager.h" #include "ash/wm/screen_dimmer.h" +#include "ash/wm/session_state_controller.h" #include "ash/wm/shadow_controller.h" #include "ash/wm/stacking_controller.h" #include "ash/wm/system_gesture_event_filter.h" @@ -247,6 +248,7 @@ Shell::~Shell() { drag_drop_controller_.reset(); magnification_controller_.reset(); power_button_controller_.reset(); + session_state_controller_.reset(); resize_shadow_controller_.reset(); shadow_controller_.reset(); tooltip_controller_.reset(); @@ -488,8 +490,10 @@ void Shell::Init() { // the correct size. user_wallpaper_delegate_->InitializeWallpaper(); - power_button_controller_.reset(new PowerButtonController); - AddShellObserver(power_button_controller_.get()); + session_state_controller_.reset(new SessionStateController); + power_button_controller_.reset(new PowerButtonController( + session_state_controller_.get())); + AddShellObserver(session_state_controller_.get()); if (initially_hide_cursor_) cursor_manager_.ShowCursor(false); |