From 977b69904d8625342ca73b3f1636ba716a565c7b Mon Sep 17 00:00:00 2001 From: "sschmitz@chromium.org" Date: Sat, 18 May 2013 02:17:50 +0000 Subject: Unify and change logout/sleep/lock shortcuts This CL implements an exit warning and requires the user to hold the exit shortcut for a while, before actually exiting. This is to prevent accidental exits due shortcut mistakes. Expert user can exit quickly with a double press. This is a second CL on this topic (see crrev.com/200204). The first had issues by relying on release events, which this CL does not. BUG=225903 R=sky@chromium.org TEST=manual out/Debug/ash_unittests --gtest_filter='AcceleratorControllerTest.ExitWarningHandlerTest*' Review URL: https://chromiumcodereview.appspot.com/14771027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200957 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/accelerators/accelerator_table.cc | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'ash/accelerators/accelerator_table.cc') diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc index ec32f2c..e60408e 100644 --- a/ash/accelerators/accelerator_table.cc +++ b/ash/accelerators/accelerator_table.cc @@ -73,8 +73,7 @@ const AcceleratorData kAcceleratorData[] = { #endif // defined(OS_CHROMEOS) { true, ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, OPEN_FEEDBACK_PAGE }, #if !defined(OS_WIN) - { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT_PRESSED }, - { false, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT_RELEASED }, + { true, ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, EXIT }, #endif { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, TOUCH_HUD_MODE_CHANGE }, @@ -280,8 +279,7 @@ const size_t kActionsAllowedAtLoginOrLockScreenLength = arraysize(kActionsAllowedAtLoginOrLockScreen); const AcceleratorAction kActionsAllowedAtLockScreen[] = { - EXIT_PRESSED, - EXIT_RELEASED + EXIT, }; const size_t kActionsAllowedAtLockScreenLength = @@ -291,8 +289,7 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = { BRIGHTNESS_DOWN, BRIGHTNESS_UP, DISABLE_CAPS_LOCK, - EXIT_PRESSED, - EXIT_RELEASED, + EXIT, KEYBOARD_BRIGHTNESS_DOWN, KEYBOARD_BRIGHTNESS_UP, MAGNIFY_SCREEN_ZOOM_IN, @@ -335,6 +332,7 @@ const AcceleratorAction kNonrepeatableActions[] = { CYCLE_BACKWARD_MRU, CYCLE_FORWARD_LINEAR, CYCLE_FORWARD_MRU, + EXIT, PRINT_UI_HIERARCHIES, // Don't fill the logs if the key is held down. ROTATE_SCREEN, ROTATE_WINDOW, @@ -357,8 +355,7 @@ const AcceleratorAction kActionsAllowedInAppMode[] = { CYCLE_FORWARD_LINEAR, CYCLE_FORWARD_MRU, DISABLE_CAPS_LOCK, - EXIT_PRESSED, - EXIT_RELEASED, + EXIT, KEYBOARD_BRIGHTNESS_DOWN, KEYBOARD_BRIGHTNESS_UP, MAGNIFY_SCREEN_ZOOM_IN, // Control+F7 -- cgit v1.1