Polish the keybinding implementation a bit.

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
===================================================================
--- chrome/common/extensions/extension.h	(revision 128819)
+++ chrome/common/extensions/extension.h	(working copy)
@@ -167,10 +167,15 @@
     const std::string& description() const { return description_; }
 
    private:
+    ui::Accelerator ParseImpl(const std::string& shortcut,
+                              const std::string& platform_key,
+                              int index,
+                              string16* error);
     std::string command_name_;
     ui::Accelerator accelerator_;
     std::string description_;
   };
+  typedef std::map<std::string, ExtensionKeybinding> Commands;

[Aaron Boodman, 2012/03/26 21:44:57]

Need a blank line before the typedef.

 
   struct TtsVoice {
     // Define out of line constructor/destructor to please Clang.
@@ -560,9 +565,15 @@
   const std::vector<InputComponentInfo>& input_components() const {
     return input_components_;
   }
-  const std::vector<ExtensionKeybinding>& keybindings() const {
-    return commands_;
+  const ExtensionKeybinding* browser_action_command() const {
+    return browser_action_command_.get();
   }
+  const ExtensionKeybinding* page_action_command() const {
+    return page_action_command_.get();
+  }
+  const Commands& named_commands() const {
+    return named_commands_;
+  }
   bool has_background_page() const {
     return background_url_.is_valid() || !background_scripts_.empty();
   }
@@ -914,7 +925,9 @@
   std::vector<InputComponentInfo> input_components_;
 
   // Optional list of commands (keyboard shortcuts).
-  std::vector<ExtensionKeybinding> commands_;
+  scoped_ptr<ExtensionKeybinding> browser_action_command_;
+  scoped_ptr<ExtensionKeybinding> page_action_command_;
+  Commands named_commands_;
 
   // Optional list of web accessible extension resources.
   base::hash_set<std::string> web_accessible_resources_;