Index: ash/accelerators/accelerator_table.h |
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h |
index 788de46e5c83d875bf7dae22d8b4e5563475d7db..e02249ef35f1c1021d84b2c4f4e44c9019cb3e87 100644 |
--- a/ash/accelerators/accelerator_table.h |
+++ b/ash/accelerators/accelerator_table.h |
@@ -9,75 +9,10 @@ |
#include "ash/ash_export.h" |
#include "ui/aura/event.h" |
-namespace ash { |
+// Used to inclulde AcceleratorAction definition which originally was here |
Nirnimesh
2012/07/17 23:05:35
end with .
|
+#include "ash/accelerators/accelerator_action.h" |
-// Please put if/def sections at the end of the bare section and keep the list |
-// within each section in alphabetical order. |
-enum AcceleratorAction { |
- BRIGHTNESS_DOWN, |
- BRIGHTNESS_UP, |
- CYCLE_BACKWARD_LINEAR, |
- CYCLE_BACKWARD_MRU, |
- CYCLE_FORWARD_LINEAR, |
- CYCLE_FORWARD_MRU, |
- EXIT, |
- FOCUS_LAUNCHER, |
- FOCUS_NEXT_PANE, |
- FOCUS_PREVIOUS_PANE, |
- FOCUS_SYSTEM_TRAY, |
- MAGNIFY_SCREEN_ZOOM_IN, |
- MAGNIFY_SCREEN_ZOOM_OUT, |
- NEW_INCOGNITO_WINDOW, |
- NEW_TAB, |
- NEW_WINDOW, |
- NEXT_IME, |
- PREVIOUS_IME, |
- RESTORE_TAB, |
- ROTATE_WINDOWS, |
- SELECT_LAST_WIN, |
- SELECT_WIN_0, |
- SELECT_WIN_1, |
- SELECT_WIN_2, |
- SELECT_WIN_3, |
- SELECT_WIN_4, |
- SELECT_WIN_5, |
- SELECT_WIN_6, |
- SELECT_WIN_7, |
- SHOW_KEYBOARD_OVERLAY, |
- SHOW_OAK, |
- SHOW_TASK_MANAGER, |
- SWITCH_IME, // Switch to another IME depending on the accelerator. |
- TAKE_PARTIAL_SCREENSHOT, |
- TAKE_SCREENSHOT, |
- TOGGLE_APP_LIST, |
- TOGGLE_CAPS_LOCK, |
- TOGGLE_SPOKEN_FEEDBACK, |
- VOLUME_DOWN, |
- VOLUME_MUTE, |
- VOLUME_UP, |
- WINDOW_MAXIMIZE_RESTORE, |
- WINDOW_MINIMIZE, |
- WINDOW_POSITION_CENTER, |
- WINDOW_SNAP_LEFT, |
- WINDOW_SNAP_RIGHT, |
-#if defined(OS_CHROMEOS) |
- CYCLE_DISPLAY_MODE, |
- LOCK_SCREEN, |
- OPEN_CROSH, |
- OPEN_FILE_MANAGER_DIALOG, |
- OPEN_FILE_MANAGER_TAB, |
-#endif |
- DISPLAY_ADD_REMOVE, |
- DISPLAY_CYCLE, |
- DISPLAY_TOGGLE_SCALE, |
- ROTATE_SCREEN, |
- TOGGLE_DESKTOP_BACKGROUND_MODE, |
- TOGGLE_ROOT_WINDOW_FULL_SCREEN, |
-#if !defined(NDEBUG) |
- PRINT_LAYER_HIERARCHY, |
- PRINT_WINDOW_HIERARCHY, |
-#endif |
-}; |
+namespace ash { |
struct AcceleratorData { |
bool trigger_on_press; |