Alphabetise AcceleratorController::PerformAction()

ash/accelerators/accelerator_table.cc

Index: ash/accelerators/accelerator_table.cc
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 0bd5bea64f86e3cbe0baab2227627b84cd002a65..7ee1e2fb589c5b8a686120fe905417e57747f787 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -254,9 +254,6 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
   DEBUG_PRINT_LAYER_HIERARCHY,
   DEBUG_PRINT_VIEW_HIERARCHY,
   DEBUG_PRINT_WINDOW_HIERARCHY,
-  DISABLE_CAPS_LOCK,
-  KEYBOARD_BRIGHTNESS_DOWN,
-  KEYBOARD_BRIGHTNESS_UP,
   MAGNIFY_SCREEN_ZOOM_IN,  // Control+F7
   MAGNIFY_SCREEN_ZOOM_OUT,  // Control+F6
   NEXT_IME,
@@ -267,18 +264,21 @@ const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[] = {
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
   TAKE_PARTIAL_SCREENSHOT,
   TAKE_SCREENSHOT,
-  TOGGLE_CAPS_LOCK,
-  TOGGLE_WIFI,
-  TOUCH_HUD_CLEAR,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
 #if defined(OS_CHROMEOS)
   DEBUG_ADD_REMOVE_DISPLAY,
+  DISABLE_CAPS_LOCK,
   DISABLE_GPU_WATCHDOG,
+  KEYBOARD_BRIGHTNESS_DOWN,
+  KEYBOARD_BRIGHTNESS_UP,
+  TOGGLE_CAPS_LOCK,
   TOGGLE_SPOKEN_FEEDBACK,
   TOGGLE_TOUCH_VIEW_TESTING,
   TOGGLE_MIRROR_MODE,
+  TOGGLE_WIFI,
+  TOUCH_HUD_CLEAR,
 #endif
 #if defined(OS_CHROMEOS) && !defined(NDEBUG)
   POWER_PRESSED,
@@ -299,10 +299,7 @@ const size_t kActionsAllowedAtLockScreenLength =
 const AcceleratorAction kActionsAllowedAtModalWindow[] = {
   BRIGHTNESS_DOWN,
   BRIGHTNESS_UP,
-  DISABLE_CAPS_LOCK,
   EXIT,
-  KEYBOARD_BRIGHTNESS_DOWN,
-  KEYBOARD_BRIGHTNESS_UP,
   MAGNIFY_SCREEN_ZOOM_IN,
   MAGNIFY_SCREEN_ZOOM_OUT,
   MEDIA_NEXT_TRACK,
@@ -310,8 +307,6 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
   MEDIA_PREV_TRACK,
   NEXT_IME,
   OPEN_FEEDBACK_PAGE,
-  POWER_PRESSED,
-  POWER_RELEASED,
   PREVIOUS_IME,
   PRINT_UI_HIERARCHIES,
   ROTATE_SCREEN,
@@ -322,17 +317,22 @@ const AcceleratorAction kActionsAllowedAtModalWindow[] = {
   SWITCH_IME,
   TAKE_PARTIAL_SCREENSHOT,
   TAKE_SCREENSHOT,
-  TOGGLE_CAPS_LOCK,
-  TOGGLE_WIFI,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
 #if defined(OS_CHROMEOS)
   DEBUG_ADD_REMOVE_DISPLAY,
+  DISABLE_CAPS_LOCK,
+  KEYBOARD_BRIGHTNESS_DOWN,
+  KEYBOARD_BRIGHTNESS_UP,
   LOCK_SCREEN,
+  POWER_PRESSED,
+  POWER_RELEASED,
   SWAP_PRIMARY_DISPLAY,
+  TOGGLE_CAPS_LOCK,
   TOGGLE_MIRROR_MODE,
   TOGGLE_SPOKEN_FEEDBACK,
+  TOGGLE_WIFI,
 #endif
 };
 
@@ -365,17 +365,12 @@ const AcceleratorAction kActionsAllowedInAppMode[] = {
   DEBUG_PRINT_LAYER_HIERARCHY,
   DEBUG_PRINT_VIEW_HIERARCHY,
   DEBUG_PRINT_WINDOW_HIERARCHY,
-  DISABLE_CAPS_LOCK,
-  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,
   PREVIOUS_IME,
   PRINT_UI_HIERARCHIES,
   ROTATE_SCREEN,
@@ -383,18 +378,23 @@ const AcceleratorAction kActionsAllowedInAppMode[] = {
   SCALE_UI_RESET,
   SCALE_UI_UP,
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
-  TOGGLE_CAPS_LOCK,
-  TOGGLE_WIFI,
-  TOUCH_HUD_CLEAR,
   VOLUME_DOWN,
   VOLUME_MUTE,
   VOLUME_UP,
 #if defined(OS_CHROMEOS)
   DEBUG_ADD_REMOVE_DISPLAY,
+  DISABLE_CAPS_LOCK,
   DISABLE_GPU_WATCHDOG,
+  KEYBOARD_BRIGHTNESS_DOWN,
+  KEYBOARD_BRIGHTNESS_UP,
+  POWER_PRESSED,
+  POWER_RELEASED,
   SWAP_PRIMARY_DISPLAY,
+  TOGGLE_CAPS_LOCK,
   TOGGLE_MIRROR_MODE,
   TOGGLE_SPOKEN_FEEDBACK,
+  TOGGLE_WIFI,
+  TOUCH_HUD_CLEAR,
 #endif  // defined(OS_CHROMEOS)
 };