Chromium Code Reviews| Index: ash/wm/power_button_controller.cc |
| diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc |
| index 73c1a3bbbafbd8155db17c41bbf708ec6b40763b..12ff6149c92713b1c7e45c988408fcf9bc603d8d 100644 |
| --- a/ash/wm/power_button_controller.cc |
| +++ b/ash/wm/power_button_controller.cc |
| @@ -6,6 +6,7 @@ |
| #include "ash/ash_switches.h" |
| #include "ash/shell.h" |
| +#include "ash/shell_delegate.h" |
| #include "ash/shell_window_ids.h" |
| #include "ash/wm/cursor_manager.h" |
| #include "base/command_line.h" |
| @@ -472,6 +473,12 @@ void PowerButtonController::OnRootWindowResized(const aura::RootWindow* root, |
| background_layer_->SetBounds(gfx::Rect(root->bounds().size())); |
| } |
| +void PowerButtonController::OnRootWindowHostClosed(const aura::RootWindow*) { |
| + if(Shell::GetInstance() && Shell::GetInstance()->delegate()) { |
| + Shell::GetInstance()->delegate()->Exit(); |
|
sadrul
2012/08/07 13:29:03
Is this change to make sure chrome terminates if t
Harry McCleave
2012/08/07 18:30:14
In its current form the host window doesn't actual
sadrul
2012/08/07 22:13:24
If the user terminates chrome from within chrome (
|
| + } |
| +} |
| + |
| bool PowerButtonController::LoggedInAsNonGuest() const { |
| if (login_status_ == user::LOGGED_IN_NONE) |
| return false; |