ash: Clean up window cycling accelerator code

ash/accelerators/accelerator_table.h

 // 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.
 
 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "ui/base/events/event_constants.h"
@@ skipping 27 matching lines @@
 // In particular, there is not an accelerator processing pass for Ash after
 // the browser gets the accelerator.  See crbug.com/285308 for details.
 //
 // Please put if/def sections at the end of the bare section and keep the list
 // within each section in alphabetical order.
 enum AcceleratorAction {
   ACCESSIBLE_FOCUS_NEXT,
   ACCESSIBLE_FOCUS_PREVIOUS,
   BRIGHTNESS_DOWN,
   BRIGHTNESS_UP,
-  CYCLE_BACKWARD_LINEAR,
   CYCLE_BACKWARD_MRU,
-  CYCLE_FORWARD_LINEAR,
   CYCLE_FORWARD_MRU,
+  CYCLE_LINEAR,
   DEBUG_TOGGLE_DEVICE_SCALE_FACTOR,
   DEBUG_TOGGLE_SHOW_DEBUG_BORDERS,
   DEBUG_TOGGLE_SHOW_FPS_COUNTER,
   DEBUG_TOGGLE_SHOW_PAINT_RECTS,
   DISABLE_CAPS_LOCK,
   EXIT,
   FOCUS_LAUNCHER,
   FOCUS_NEXT_PANE,
   FOCUS_PREVIOUS_PANE,
   KEYBOARD_BRIGHTNESS_DOWN,
@@ skipping 74 matching lines @@
 
 struct AcceleratorData {
   bool trigger_on_press;
   ui::KeyboardCode keycode;
   int modifiers;
   AcceleratorAction action;
 };
 
 // Accelerators handled by AcceleratorController.
 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
-
-// The number of elements in kAcceleratorData.

[James Cook, 2013/09/04 23:16:46]

While working on an earlier CL I found these comments interfered with my ability
to see all the categories of accelerators, so I removed them.  They didn't seem
that useful.

 ASH_EXPORT extern const size_t kAcceleratorDataLength;
 
 #if !defined(NDEBUG)
 // Accelerators useful when running on desktop. Debug build only.
 ASH_EXPORT extern const AcceleratorData kDesktopAcceleratorData[];
-
-// The number of elements in kDesktopAcceleratorData.
 ASH_EXPORT extern const size_t kDesktopAcceleratorDataLength;
 #endif
 
 // Debug accelerators enabled only when "Debugging keyboard shortcuts" flag
 // (--ash-debug-shortcuts) is enabled.
 ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[];
-
-// The number of elements in kDebugAcceleratorData.
 ASH_EXPORT extern const size_t kDebugAcceleratorDataLength;
 
 // Actions that should be handled very early in Ash unless the current target
 // window is full-screen.
 ASH_EXPORT extern const AcceleratorAction kReservedActions[];
-
-// The number of elements in kReservedActions.
 ASH_EXPORT extern const size_t kReservedActionsLength;
 
 // Actions that should be handled very early in Ash unless the current target
 // window is full-screen, these actions are only handled if
 // DebugShortcutsEnabled is true (command line switch 'ash-debug-shortcuts').
 ASH_EXPORT extern const AcceleratorAction kReservedDebugActions[];
-
-// The number of elements in kReservedDebugActions.
 ASH_EXPORT extern const size_t kReservedDebugActionsLength;
 
 // Actions allowed while user is not signed in or screen is locked.
 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLoginOrLockScreen[];
-
-// The number of elements in kActionsAllowedAtLoginOrLockScreen.
 ASH_EXPORT extern const size_t kActionsAllowedAtLoginOrLockScreenLength;
 
 // Actions allowed while screen is locked (in addition to
 // kActionsAllowedAtLoginOrLockScreen).
 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtLockScreen[];
-
-// The number of elements in kActionsAllowedAtLockScreen.
 ASH_EXPORT extern const size_t kActionsAllowedAtLockScreenLength;
 
 // Actions allowed while a modal window is up.
 ASH_EXPORT extern const AcceleratorAction kActionsAllowedAtModalWindow[];
-
-// The number of elements in kActionsAllowedAtModalWindow.
 ASH_EXPORT extern const size_t kActionsAllowedAtModalWindowLength;
 
 // Actions which will not be repeated while holding an accelerator key.
 ASH_EXPORT extern const AcceleratorAction kNonrepeatableActions[];
-
-// The number of elements in kNonrepeatableActions.
 ASH_EXPORT extern const size_t kNonrepeatableActionsLength;
 
 // Actions allowed in app mode.
 ASH_EXPORT extern const AcceleratorAction kActionsAllowedInAppMode[];
-
-// The number of elements in kActionsAllowedInAppMode.
 ASH_EXPORT extern const size_t kActionsAllowedInAppModeLength;
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_