Unify and change logout/sleep/lock shortcuts

ash/accelerators/accelerator_table.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/accelerator_table.h"
 
 #include "base/basictypes.h"
 
 namespace ash {
 
@@ skipping 55 matching lines @@
   { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
   { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG },
   { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
     OPEN_FILE_MANAGER },
   { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
   { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     DISABLE_GPU_WATCHDOG },
 #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 },
   { true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN,
     TOUCH_HUD_CLEAR },
 
   { true, ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
     NEW_INCOGNITO_WINDOW },
   { true, ui::VKEY_N, ui::EF_CONTROL_DOWN, NEW_WINDOW },
   { true, ui::VKEY_T, ui::EF_CONTROL_DOWN, NEW_TAB },
@@ skipping 185 matching lines @@
 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
   POWER_PRESSED,
   POWER_RELEASED,
 #endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsAllowedAtLoginOrLockScreenLength =
     arraysize(kActionsAllowedAtLoginOrLockScreen);
 
 const AcceleratorAction kActionsAllowedAtLockScreen[] = {
-  EXIT_PRESSED,
-  EXIT_RELEASED
+  EXIT,
 };
 
 const size_t kActionsAllowedAtLockScreenLength =
     arraysize(kActionsAllowedAtLockScreen);
 
 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,
   MAGNIFY_SCREEN_ZOOM_OUT,
   MEDIA_NEXT_TRACK,
   MEDIA_PLAY_PAUSE,
   MEDIA_PREV_TRACK,
   NEXT_IME,
   OPEN_FEEDBACK_PAGE,
   POWER_PRESSED,
@@ skipping 22 matching lines @@
 
 const size_t kActionsAllowedAtModalWindowLength =
     arraysize(kActionsAllowedAtModalWindow);
 
 const AcceleratorAction kNonrepeatableActions[] = {
   // TODO(mazda): Add other actions which should not be repeated.
   CYCLE_BACKWARD_LINEAR,
   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,
   SCALE_UI_UP,
   SCALE_UI_DOWN,
   SCALE_UI_RESET,
   TOGGLE_FULLSCREEN,
   TOGGLE_MAXIMIZED,
   WINDOW_MINIMIZE,
 };
 
 const size_t kNonrepeatableActionsLength =
     arraysize(kNonrepeatableActions);
 
 const AcceleratorAction kActionsAllowedInAppMode[] = {
   BRIGHTNESS_DOWN,
   BRIGHTNESS_UP,
   CYCLE_BACKWARD_LINEAR,
   CYCLE_BACKWARD_MRU,
   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
   MAGNIFY_SCREEN_ZOOM_OUT,  // Control+F6
   MEDIA_NEXT_TRACK,
   MEDIA_PLAY_PAUSE,
   MEDIA_PREV_TRACK,
   NEXT_IME,
   POWER_PRESSED,
   POWER_RELEASED,
@@ skipping 19 matching lines @@
   ADD_REMOVE_DISPLAY,
   DISABLE_GPU_WATCHDOG,
   TOGGLE_MIRROR_MODE,
 #endif  // defined(OS_CHROMEOS)
 };
 
 const size_t kActionsAllowedInAppModeLength =
     arraysize(kActionsAllowedInAppMode);
 
 }  // namespace ash