MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

chrome/browser/extensions/extension_keybinding_registry.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 CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 39 matching lines @@
   };
 
   // If |extension_filter| is not ALL_EXTENSIONS, only keybindings by
   // by extensions that match the filter will be registered.
   ExtensionKeybindingRegistry(content::BrowserContext* context,
                               ExtensionFilter extension_filter,
                               Delegate* delegate);
 
   ~ExtensionKeybindingRegistry() override;
 
-  // Enables/Disables general shortcut handling in Chrome. Implemented in
-  // platform-specific ExtensionKeybindingsRegistry* files.
-  static void SetShortcutHandlingSuspended(bool suspended);
+  // Enables/Disables general shortcut handling in Chrome.
+  virtual void SetShortcutHandlingSuspended(bool suspended);

[Devlin, 2015/01/15 22:41:43]

nit: Seeing how these are used, I might have a small preference for having a
non-virtual setter/getter, and a protected virtual (by default empty)
OnShortcutHandlingSuspended().  This way we don't have to call the super in the
subclasses.  I don't feel super strongly though.

[Andre, 2015/01/16 18:40:14]

Done.

+  bool IsShortcutHandlingSuspended();

[Devlin, 2015/01/15 22:41:43]

This should be hacker_style() now :)

[Andre, 2015/01/16 18:40:14]

Done.

 
   // Execute the command bound to |accelerator| and provided by the extension
   // with |extension_id|, if it exists.
   void ExecuteCommand(const std::string& extension_id,
                       const ui::Accelerator& accelerator);
 
   // Check whether the specified |accelerator| has been registered.
   bool IsAcceleratorRegistered(const ui::Accelerator& accelerator) const;
 
  protected:
@@ skipping 93 matching lines @@
   // accelerator (which isn't media keys) has only one target, while the media
   // keys can have more than one.
   typedef std::list<std::pair<std::string, std::string> > TargetList;
   typedef std::map<ui::Accelerator, TargetList> EventTargets;
   EventTargets event_targets_;
 
   // Listen to extension load, unloaded notifications.
   ScopedObserver<ExtensionRegistry, ExtensionRegistryObserver>
       extension_registry_observer_;
 
+  // Keeps track of whether shortcut handling is currently suspended. Shortcuts
+  // are suspended briefly while capturing which shortcut to assign to an
+  // extension command in the Config UI. If handling isn't suspended while
+  // capturing then trying to assign Ctrl+F to a command would instead result
+  // in the Find box opening.
+  bool shortcut_handling_suspended_;
+
   DISALLOW_COPY_AND_ASSIGN(ExtensionKeybindingRegistry);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_KEYBINDING_REGISTRY_H_