Conflict detection for Extension Keybinding.

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 <algorithm>
 #include <map>
@@ skipping 146 matching lines @@
     bool shortcut_ctrl;
     bool shortcut_shift;
   };
 
   class ExtensionKeybinding {
    public:
     // Define out of line constructor/destructor to please Clang.
     ExtensionKeybinding();
     ~ExtensionKeybinding();
 
+    // The Keybinding platform value.
+    static std::string KeybindingPlatform();
+
     // Parse the key binding.
     bool Parse(base::DictionaryValue* command,
                const std::string& command_name,
                int index,
                string16* error);
 
     // Accessors:
     const std::string& command_name() const { return command_name_; }
     const ui::Accelerator& accelerator() const { return accelerator_; }
     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_;
   };
 
+  // A mapping of command name (std::string) to a keybinding object.
   typedef std::map<std::string, ExtensionKeybinding> CommandMap;
 
   struct TtsVoice {
     // Define out of line constructor/destructor to please Clang.
     TtsVoice();
     ~TtsVoice();
 
     std::string voice_name;
     std::string lang;
     std::string gender;
@@ skipping 385 matching lines @@
   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_;
   }
+  // The browser action command keybinding that the extension wants to use,
+  // which is not necessarily the one it can use, as it might be inacive.

[Yoyo Zhou, 2012/05/01 01:51:30]

nit: typo. %s/inacive/inactive/. Also delete the period after inactive.

+  // (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_;
   }
   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 514 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_