Polish the keybinding implementation a bit.

chrome/common/extensions/extension.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_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 133 matching lines @@
     std::string language;
     std::set<std::string> layouts;
     std::string shortcut_keycode;
     bool shortcut_alt;
     bool shortcut_ctrl;
     bool shortcut_shift;
   };
 
   class ExtensionKeybinding {
    public:
+    enum Type {
+      BROWSER_ACTION,
+      PAGE_ACTION,
+      COMMANDS,
+    };
+
     // Define out of line constructor/destructor to please Clang.
     ExtensionKeybinding();
     ~ExtensionKeybinding();
 
     // Parse the key binding.
     bool Parse(base::DictionaryValue* command,
                const std::string& command_name,
                int index,
                string16* error);
 
@@ skipping 352 matching lines @@
 
   // Returns the sync bucket to use for this extension.
   SyncType GetSyncType() const;
 
   // Returns true if the extension should be synced.
   bool IsSyncable() const;
 
   // Returns true if the extension should be displayed in the launcher.
   bool ShouldDisplayInLauncher() const;
 
+  // Gets an extension keybindings by |type|.
+  void GetCommandByType(
+      Extension::ExtensionKeybinding::Type type,
+      std::vector<Extension::ExtensionKeybinding>* keybindings) const;
+
   // Accessors:
 
   const FilePath& path() const { return path_; }
   const GURL& url() const { return extension_url_; }
   Location location() const;
   const std::string& id() const;
   const Version* version() const { return version_.get(); }
   const std::string VersionString() const;
   const std::string& name() const { return name_; }
   const std::string public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   int manifest_version() const { return manifest_version_; }
   bool converted_from_user_script() const {
     return converted_from_user_script_;
   }
   const UserScriptList& content_scripts() const { return content_scripts_; }
   ExtensionAction* page_action() const { return page_action_.get(); }
   ExtensionAction* browser_action() const { return browser_action_.get(); }
   const FileBrowserHandlerList* file_browser_handlers() const {
     return file_browser_handlers_.get();
   }
   const std::vector<PluginInfo>& plugins() const { return plugins_; }
   const std::vector<NaClModuleInfo>& nacl_modules() const {
     return nacl_modules_;
   }
   const std::vector<InputComponentInfo>& input_components() const {
     return input_components_;
   }
+  // See also GetCommandByType, which allows finer grained control over
+  // which commands are returned.
   const std::vector<ExtensionKeybinding>& keybindings() const {
     return commands_;
   }
   bool has_background_page() const {
     return background_url_.is_valid() || !background_scripts_.empty();
   }
   bool allow_background_js_access() const {
     return allow_background_js_access_;
   }
   const std::vector<std::string>& background_scripts() const {
@@ skipping 505 matching lines @@
   // only contain the removed permissions.
   const ExtensionPermissionSet* permissions;
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const ExtensionPermissionSet* permissions,
       Reason reason);
 };
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_