| Index: ash/accelerators/accelerator_controller.cc
|
| diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
|
| index 43e2dac547950e5c85a02a14175b7ff9758854af..e785f64de1d30578471e1d7fa1e1eeac4640cae1 100644
|
| --- a/ash/accelerators/accelerator_controller.cc
|
| +++ b/ash/accelerators/accelerator_controller.cc
|
| @@ -376,6 +376,7 @@ AcceleratorController::~AcceleratorController() {
|
| }
|
|
|
| void AcceleratorController::Init() {
|
| + exit_warning_handler_.Init(context());
|
| for (size_t i = 0; i < kActionsAllowedAtLoginOrLockScreenLength; ++i) {
|
| actions_allowed_at_login_screen_.insert(
|
| kActionsAllowedAtLoginOrLockScreen[i]);
|
| @@ -577,9 +578,8 @@ bool AcceleratorController::PerformAction(int action,
|
| case OPEN_FEEDBACK_PAGE:
|
| ash::Shell::GetInstance()->delegate()->OpenFeedbackPage();
|
| return true;
|
| - case EXIT_PRESSED:
|
| - case EXIT_RELEASED:
|
| - exit_warning_handler_.HandleExitKey(action == EXIT_PRESSED);
|
| + case EXIT:
|
| + exit_warning_handler_.HandleAccelerator();
|
| return true;
|
| case NEW_INCOGNITO_WINDOW:
|
| Shell::GetInstance()->delegate()->NewWindow(true /* is_incognito */);
|
|
|