Introduce "Preferred" accelerators

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/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 namespace ash {
 
 // There are four classes of accelerators in Ash:

[James Cook, 2014/09/19 16:13:15]

Can you update this comment?

[oshima, 2014/09/19 18:55:19]

Done.

 //
 // Ash (OS) reserved:
 // * Neither packaged apps nor web pages can cancel.
 // * For example, Alt-Tab window cycling.
 // * See kReservedActions below.
 //
 // Chrome OS system keys:
 // * For legacy reasons, v1 apps can process and cancel. Otherwise handled
 //   directly by Ash.
 // * Brightness, volume control, etc.
@@ skipping 103 matching lines @@
   WINDOW_SNAP_RIGHT,
 #if defined(OS_CHROMEOS)
   ADD_REMOVE_DISPLAY,
   TOGGLE_MIRROR_MODE,
   DISABLE_GPU_WATCHDOG,
   LOCK_SCREEN,
   OPEN_CROSH,
   OPEN_FILE_MANAGER,
   SWITCH_TO_NEXT_USER,
   SWITCH_TO_PREVIOUS_USER,
+#else
+  DUMMY_FOR_RESERVED,
 #endif
 };
 
 struct AcceleratorData {
   bool trigger_on_press;
   ui::KeyboardCode keycode;
   int modifiers;
   AcceleratorAction action;
 };
 
 // Accelerators handled by AcceleratorController.
 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
 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[];
 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[];
 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 kPreferredActions[];
+ASH_EXPORT extern const size_t kPreferredActionsLength;
+
+// Actions that are always handled in Ash

[James Cook, 2014/09/19 16:13:15]

nit: end with .

[oshima, 2014/09/19 18:55:19]

Done.

 ASH_EXPORT extern const AcceleratorAction 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[];
 ASH_EXPORT extern const size_t kReservedDebugActionsLength;
 
 // Actions allowed while user is not signed in or screen is locked.
@@ skipping 17 matching lines @@
 ASH_EXPORT extern const AcceleratorAction kActionsAllowedInAppMode[];
 ASH_EXPORT extern const size_t kActionsAllowedInAppModeLength;
 
 // Actions that require at least 1 window.
 ASH_EXPORT extern const AcceleratorAction kActionsNeedingWindow[];
 ASH_EXPORT extern const size_t kActionsNeedingWindowLength;
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_