Introduce "Preferred" accelerators

ash/accelerators/accelerator_controller.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_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <map>
 #include <set>
 
@@ skipping 59 matching lines @@
   // First, AcceleratorPressed handler of the most recently registered target
   // is called, and if that handler processes the event (i.e. returns true),
   // this method immediately returns. If not, we do the same thing on the next
   // target, and so on.
   // Returns true if an accelerator was activated.
   bool Process(const ui::Accelerator& accelerator);
 
   // Returns true if the |accelerator| is registered.
   bool IsRegistered(const ui::Accelerator& accelerator) const;
 
-  // Returns true if the |accelerator| is one of the |reserved_actions_|.
-  bool IsReservedAccelerator(const ui::Accelerator& accelerator) const;
+  // Returns true if the |accelerator| is preferred. A preferred accelerator
+  // is handled before being passed to an window/web contents, unless
+  // the window is in fullscreen state.

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

nice comments

+  bool IsPreferred(const ui::Accelerator& accelerator) const;
+
+  // Returns true if the |accelerator| is reserved. A reserved accelerator
+  // is always handled and will never passedto an window/web contents.

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

nit: "never be passed to"

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

Done.

+  bool IsReserved(const ui::Accelerator& accelerator) const;
 
   // Performs the specified action. The |accelerator| may provide additional
   // data the action needs. Returns whether an action was performed
   // successfully.
   bool PerformAction(int action,
                      const ui::Accelerator& accelerator);
 
   // Returns the restriction for the current context.
   AcceleratorProcessingRestriction GetCurrentAcceleratorRestriction();
 
@@ skipping 65 matching lines @@
   // A map from accelerators to the AcceleratorAction values, which are used in
   // the implementation.
   std::map<ui::Accelerator, int> accelerators_;
 
   // Actions allowed when the user is not signed in.
   std::set<int> actions_allowed_at_login_screen_;
   // Actions allowed when the screen is locked.
   std::set<int> actions_allowed_at_lock_screen_;
   // Actions allowed when a modal window is up.
   std::set<int> actions_allowed_at_modal_window_;
   // Reserved actions. See accelerator_table.h for details.

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

nit: Reserved -> Preferred

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

Done.

+  std::set<int> preferred_actions_;
+  // Reserved actions. See accelerator_table.h for details.
   std::set<int> reserved_actions_;
   // Actions which will not be repeated while holding the accelerator key.
   std::set<int> nonrepeatable_actions_;
   // Actions allowed in app mode.
   std::set<int> actions_allowed_in_app_mode_;
   // Actions disallowed if there are no windows.
   std::set<int> actions_needing_window_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_