Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 14771027: Unify and change logout/sleep/lock shortcuts (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 */);

Powered by Google App Engine
This is Rietveld 408576698