This adds a webui overlay on the extensions page for showing what Extension keybindings are active.…

chrome/browser/extensions/api/commands/extension_command_service.cc

 // 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.
 
 #include "chrome/browser/extensions/api/commands/extension_command_service.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
@@ skipping 11 matching lines @@
 const char kCommandName[] = "command_name";
 
 std::string GetPlatformKeybindingKeyForAccelerator(
     const ui::Accelerator& accelerator) {
   return extensions::Command::CommandPlatform() + ":" +
          UTF16ToUTF8(accelerator.GetShortcutText());
 }
 
 }  // namespace
 
+namespace extensions {
+
 // static
 void ExtensionCommandService::RegisterUserPrefs(
   PrefService* user_prefs) {
       user_prefs->RegisterDictionaryPref(prefs::kExtensionKeybindings,
                                          PrefService::SYNCABLE_PREF);
 }
 
 ExtensionCommandService::ExtensionCommandService(
     Profile* profile)
     : profile_(profile) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_INSTALLED,
       content::Source<Profile>(profile));
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNINSTALLED,
       content::Source<Profile>(profile));
 }
 
 ExtensionCommandService::~ExtensionCommandService() {
 }
 
 const extensions::Command*
-    ExtensionCommandService::GetActiveBrowserActionCommand(
-        const std::string& extension_id) {
+    ExtensionCommandService::GetBrowserActionCommand(
+        const std::string& extension_id, QueryType type) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
   const extensions::Command* command = extension->browser_action_command();
   if (!command)
     return NULL;
-  if (!IsKeybindingActive(command->accelerator(),
+  if (type == ACTIVE_ONLY &&
+      !IsKeybindingActive(command->accelerator(),
                           extension_id,
                           command->command_name())) {
     return NULL;
   }
 
   return command;
 }
 
-const extensions::Command* ExtensionCommandService::GetActivePageActionCommand(
-    const std::string& extension_id) {
+const extensions::Command* ExtensionCommandService::GetPageActionCommand(
+    const std::string& extension_id, QueryType type) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
   const extensions::Command* command = extension->page_action_command();
   if (!command)
     return NULL;
-  if (!IsKeybindingActive(command->accelerator(),
+  if (type == ACTIVE_ONLY &&
+      !IsKeybindingActive(command->accelerator(),
                           extension_id,
                           command->command_name())) {
     return NULL;
   }
 
   return command;
 }
 
-extensions::CommandMap ExtensionCommandService::GetActiveNamedCommands(
-    const std::string& extension_id) {
+extensions::CommandMap ExtensionCommandService::GetNamedCommands(
+    const std::string& extension_id, QueryType type) {
   const ExtensionSet* extensions =
       ExtensionSystem::Get(profile_)->extension_service()->extensions();
   const Extension* extension = extensions->GetByID(extension_id);
   CHECK(extension);
 
   extensions::CommandMap result;
   const extensions::CommandMap& commands = extension->named_commands();
   if (commands.empty())
     return result;
 
   extensions::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
-    if (!IsKeybindingActive(iter->second.accelerator(),
+    if (type == ACTIVE_ONLY &&
+        !IsKeybindingActive(iter->second.accelerator(),
                             extension_id,
                             iter->second.command_name())) {
       continue;
     }
 
     result[iter->second.command_name()] = iter->second;
   }
 
   return result;
 }
 
 bool ExtensionCommandService::IsKeybindingActive(
     const ui::Accelerator& accelerator,
-    std::string extension_id,
-    std::string command_name) {
+    const std::string& extension_id,
+    const std::string& command_name) const {
   CHECK(!extension_id.empty());
   CHECK(!command_name.empty());
 
   std::string key = GetPlatformKeybindingKeyForAccelerator(accelerator);
   const DictionaryValue* bindings =
       profile_->GetPrefs()->GetDictionary(prefs::kExtensionKeybindings);
   if (!bindings->HasKey(key))
     return false;
 
   DictionaryValue* value = NULL;
@@ skipping 97 matching lines @@
     item->GetString(kExtension, &extension);
     if (extension == extension_id)
       keys_to_remove.push_back(key);
   }
 
   for (KeysToRemove::const_iterator it = keys_to_remove.begin();
        it != keys_to_remove.end(); ++it) {
     bindings->Remove(*it, NULL);
   }
 }
+
+}  // namespace extensions