Index: ash/accelerators/accelerator_table.h |
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h |
index af30c5d438bdad54352e7ca7f07c9a69d448da66..6d61fb9ccd38fb4022f52a2298e4b01e4d220fad 100644 |
--- a/ash/accelerators/accelerator_table.h |
+++ b/ash/accelerators/accelerator_table.h |
@@ -66,13 +66,10 @@ enum AcceleratorAction { |
DEBUG_TOGGLE_SHOW_DEBUG_BORDERS, |
DEBUG_TOGGLE_SHOW_FPS_COUNTER, |
DEBUG_TOGGLE_SHOW_PAINT_RECTS, |
- DISABLE_CAPS_LOCK, |
EXIT, |
FOCUS_NEXT_PANE, |
FOCUS_PREVIOUS_PANE, |
FOCUS_SHELF, |
- KEYBOARD_BRIGHTNESS_DOWN, |
- KEYBOARD_BRIGHTNESS_UP, |
LAUNCH_APP_0, |
LAUNCH_APP_1, |
LAUNCH_APP_2, |
@@ -82,8 +79,6 @@ enum AcceleratorAction { |
LAUNCH_APP_6, |
LAUNCH_APP_7, |
LAUNCH_LAST_APP, |
- LOCK_PRESSED, |
- LOCK_RELEASED, |
MAGNIFY_SCREEN_ZOOM_IN, |
MAGNIFY_SCREEN_ZOOM_OUT, |
MEDIA_NEXT_TRACK, |
@@ -94,8 +89,6 @@ enum AcceleratorAction { |
NEW_WINDOW, |
NEXT_IME, |
OPEN_FEEDBACK_PAGE, |
- POWER_PRESSED, |
- POWER_RELEASED, |
PREVIOUS_IME, |
PRINT_UI_HIERARCHIES, |
RESTORE_TAB, |
@@ -108,23 +101,13 @@ enum AcceleratorAction { |
SHOW_MESSAGE_CENTER_BUBBLE, |
SHOW_SYSTEM_TRAY_BUBBLE, |
SHOW_TASK_MANAGER, |
- SILENCE_SPOKEN_FEEDBACK, |
- SWAP_PRIMARY_DISPLAY, |
SWITCH_IME, // Switch to another IME depending on the accelerator. |
TAKE_PARTIAL_SCREENSHOT, |
TAKE_SCREENSHOT, |
TOGGLE_APP_LIST, |
- TOGGLE_CAPS_LOCK, |
- TOGGLE_CAPS_LOCK_BY_ALT_LWIN, |
TOGGLE_FULLSCREEN, |
TOGGLE_MAXIMIZED, |
TOGGLE_OVERVIEW, |
- TOGGLE_SPOKEN_FEEDBACK, |
- TOGGLE_TOUCH_VIEW_TESTING, |
- TOGGLE_WIFI, |
- TOUCH_HUD_CLEAR, |
- TOUCH_HUD_MODE_CHANGE, |
- TOUCH_HUD_PROJECTION_TOGGLE, |
VOLUME_DOWN, |
VOLUME_MUTE, |
VOLUME_UP, |
@@ -134,13 +117,29 @@ enum AcceleratorAction { |
WINDOW_CYCLE_SNAP_DOCK_RIGHT, |
#if defined(OS_CHROMEOS) |
DEBUG_ADD_REMOVE_DISPLAY, |
+ DISABLE_CAPS_LOCK, |
DISABLE_GPU_WATCHDOG, |
+ KEYBOARD_BRIGHTNESS_DOWN, |
+ KEYBOARD_BRIGHTNESS_UP, |
+ LOCK_PRESSED, |
+ LOCK_RELEASED, |
LOCK_SCREEN, |
OPEN_CROSH, |
OPEN_FILE_MANAGER, |
+ POWER_PRESSED, |
+ POWER_RELEASED, |
+ SILENCE_SPOKEN_FEEDBACK, |
+ SWAP_PRIMARY_DISPLAY, |
SWITCH_TO_NEXT_USER, |
SWITCH_TO_PREVIOUS_USER, |
+ TOGGLE_CAPS_LOCK, |
TOGGLE_MIRROR_MODE, |
+ TOGGLE_SPOKEN_FEEDBACK, |
+ TOGGLE_TOUCH_VIEW_TESTING, |
+ TOGGLE_WIFI, |
+ TOUCH_HUD_CLEAR, |
+ TOUCH_HUD_MODE_CHANGE, |
+ TOUCH_HUD_PROJECTION_TOGGLE, |
#else |
DUMMY_FOR_RESERVED, |
#endif |