| Index: ash/accelerators/accelerator_table.h
|
| diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
|
| index cf996603ae7c7f3446c724247d7dbe93cb80880c..86d2324a9a1bd5bd02f5bc922bcd9a305452cc23 100644
|
| --- a/ash/accelerators/accelerator_table.h
|
| +++ b/ash/accelerators/accelerator_table.h
|
| @@ -19,6 +19,9 @@ enum AcceleratorAction {
|
| CYCLE_BACKWARD_MRU,
|
| CYCLE_FORWARD_LINEAR,
|
| CYCLE_FORWARD_MRU,
|
| + DISPLAY_ADD_REMOVE,
|
| + DISPLAY_CYCLE,
|
| + DISPLAY_TOGGLE_SCALE,
|
| EXIT,
|
| FOCUS_LAUNCHER,
|
| FOCUS_NEXT_PANE,
|
| @@ -32,8 +35,10 @@ enum AcceleratorAction {
|
| NEW_TAB,
|
| NEW_WINDOW,
|
| NEXT_IME,
|
| + OPEN_FEEDBACK_PAGE,
|
| PREVIOUS_IME,
|
| RESTORE_TAB,
|
| + ROTATE_SCREEN,
|
| ROTATE_WINDOWS,
|
| SELECT_LAST_WIN,
|
| SELECT_WIN_0,
|
| @@ -52,6 +57,8 @@ enum AcceleratorAction {
|
| TAKE_SCREENSHOT,
|
| TOGGLE_APP_LIST,
|
| TOGGLE_CAPS_LOCK,
|
| + TOGGLE_DESKTOP_BACKGROUND_MODE,
|
| + TOGGLE_ROOT_WINDOW_FULL_SCREEN,
|
| TOGGLE_SPOKEN_FEEDBACK,
|
| VOLUME_DOWN,
|
| VOLUME_MUTE,
|
| @@ -68,12 +75,6 @@ enum AcceleratorAction {
|
| 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,
|
|
|