Conflict detection for Extension Keybinding.

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
===================================================================
--- chrome/common/extensions/extension.h	(revision 133458)
+++ chrome/common/extensions/extension.h	(working copy)
@@ -185,6 +185,7 @@
     std::string description_;
   };
 
+  // A mapping of command name (std::string) to a keybinding object.
   typedef std::map<std::string, ExtensionKeybinding> CommandMap;
 
   struct TtsVoice {
@@ -585,12 +586,21 @@
   const std::vector<InputComponentInfo>& input_components() const {
     return input_components_;
   }
+  // The browser action command keybinding that the extension wants to use,

[Aaron Boodman, 2012/04/25 19:14:38]

Sigh. Bummer to carry this information around in every process when it isn't
even correct.

Can you make these getters instead, and pull the information dynamically out of
manifest_?

It still stinks to carry around the manifest, but that is a different problem.

This can be a separate change.

[Finnur, 2012/04/26 13:12:35]

Yup. Sounds good.

+  // which is not necessarily the one it can use, as it might be inacive.
+  // (see also GetActiveBrowserActionCommand in ExtensionKeybindingRegistry).
   const ExtensionKeybinding* browser_action_command() const {
     return browser_action_command_.get();
   }
+  // The page action command keybinding that the extension wants to use,
+  // which is not necessarily the one it can use, as it might be inacive.
+  // (see also GetActivePageActionCommand in ExtensionKeybindingRegistry).
   const ExtensionKeybinding* page_action_command() const {
     return page_action_command_.get();
   }
+  // The map of named commands to keybindings that the extension wants to use,
+  // which is not necessarily the one it can use, as they might be inacive.
+  // (see also GetActiveNamedCommands in ExtensionKeybindingRegistry).
   const CommandMap& named_commands() const {
     return named_commands_;
   }