summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_table.h
diff options
context:
space:
mode:
authorsschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 08:48:03 +0000
committersschmitz@chromium.org <sschmitz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 08:48:03 +0000
commit059c8d351d5083744525c595110f730081cf5280 (patch)
tree249e08b2fbbe8ff215b17ee21eb59d902598e527 /ash/accelerators/accelerator_table.h
parente9304b9fefc5deeeaa99363945ab7dd1bd6260be (diff)
downloadchromium_src-059c8d351d5083744525c595110f730081cf5280.zip
chromium_src-059c8d351d5083744525c595110f730081cf5280.tar.gz
chromium_src-059c8d351d5083744525c595110f730081cf5280.tar.bz2
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. BUG=225903 R=sky@chromium.org TEST=manual out/Debug/ash_unittests --gtest_filter='AcceleratorControllerTest.ExitWarningHandlerTest*' Review URL: https://chromiumcodereview.appspot.com/14587007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200204 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_table.h')
-rw-r--r--ash/accelerators/accelerator_table.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index ca2d2701..70e57d8d 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -28,7 +28,8 @@ enum AcceleratorAction {
DEBUG_TOGGLE_SHOW_FPS_COUNTER,
DEBUG_TOGGLE_SHOW_PAINT_RECTS,
DISABLE_CAPS_LOCK,
- EXIT,
+ EXIT_PRESSED,
+ EXIT_RELEASED,
FOCUS_LAUNCHER,
FOCUS_NEXT_PANE,
FOCUS_PREVIOUS_PANE,