Implement first part of supporting global extension commands.

chrome/browser/extensions/extension_commands_global_registry.cc

Index: chrome/browser/extensions/extension_commands_global_registry.cc
diff --git a/chrome/browser/extensions/extension_commands_global_registry.cc b/chrome/browser/extensions/extension_commands_global_registry.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d32a9d0eee099c60d7129bd250211cf955b84aa7
--- /dev/null
+++ b/chrome/browser/extensions/extension_commands_global_registry.cc
@@ -0,0 +1,136 @@
+// Copyright (c) 2013 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/extension_commands_global_registry.h"
+
+#include "base/lazy_instance.h"
+#include "chrome/browser/chrome_notification_types.h"
+#include "chrome/browser/extensions/api/commands/command_service.h"
+#include "chrome/browser/extensions/extension_keybinding_registry.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/global_shortcut_listener.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/common/extensions/extension.h"
+
+namespace extensions {
+
+ExtensionCommandsGlobalRegistry::ExtensionCommandsGlobalRegistry(
+    Profile* profile)
+    : ExtensionKeybindingRegistry(
+          profile, ExtensionKeybindingRegistry::ALL_EXTENSIONS, NULL),
+      profile_(profile) {
+  Init();
+}
+
+ExtensionCommandsGlobalRegistry::~ExtensionCommandsGlobalRegistry() {
+  EventTargets::const_iterator iter;
+  for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter) {
+    GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
+        iter->first, this);
+  }
+}
+
+static base::LazyInstance<
+    ProfileKeyedAPIFactory<ExtensionCommandsGlobalRegistry> >
+g_factory = LAZY_INSTANCE_INITIALIZER;
+
+// static
+ProfileKeyedAPIFactory<ExtensionCommandsGlobalRegistry>*
+ExtensionCommandsGlobalRegistry::GetFactoryInstance() {
+  return &g_factory.Get();
+}
+
+template<>
+void ProfileKeyedAPIFactory<
+    ExtensionCommandsGlobalRegistry>::DeclareFactoryDependencies() {
+  DependsOn(ExtensionSystemFactory::GetInstance());

[Yoyo Zhou, 2013/10/03 22:08:50]

This is already the default for DeclareFactoryDependencies so you don't need to
override it if it just looks like this.

[Finnur, 2013/10/04 17:57:02]

Done.

+}
+
+// static
+ExtensionCommandsGlobalRegistry*
+ExtensionCommandsGlobalRegistry::Get(Profile* profile) {
+  return ProfileKeyedAPIFactory<
+      ExtensionCommandsGlobalRegistry>::GetForProfile(profile);
+}
+
+
+void ExtensionCommandsGlobalRegistry::AddExtensionKeybinding(
+    const extensions::Extension* extension,
+    const std::string& command_name) {
+  // This object only handles named commands, not browser/page actions.
+  if (ShouldIgnoreCommand(command_name))
+    return;
+
+  extensions::CommandService* command_service =
+      extensions::CommandService::Get(profile_);
+  // Add all the active keybindings (except page actions and browser actions,

[Yoyo Zhou, 2013/10/03 22:08:50]

This comment doesn't seem to make sense, since page/browser actions can't be
global keybindings.

[Finnur, 2013/10/04 17:57:02]

Done.

+  // which are handled elsewhere).
+  extensions::CommandMap commands;
+  if (!command_service->GetNamedCommands(
+          extension->id(),
+          extensions::CommandService::ACTIVE_ONLY,
+          extensions::CommandService::GLOBAL,
+          &commands))
+    return;
+
+  extensions::CommandMap::const_iterator iter = commands.begin();
+  for (; iter != commands.end(); ++iter) {
+    if (!command_name.empty() && (iter->second.command_name() != command_name))
+      continue;
+
+    LOG(ERROR) << "Adding global keybinding for " << extension->name().c_str()

[Yoyo Zhou, 2013/10/03 22:08:50]

VLOG?

[Finnur, 2013/10/04 17:57:02]

Done.

+               << " " << command_name.c_str()
+               << " key: " << iter->second.accelerator().GetShortcutText();
+
+    event_targets_[iter->second.accelerator()] =
+        std::make_pair(extension->id(), iter->second.command_name());
+
+    GlobalShortcutListener::GetInstance()->RegisterAccelerator(
+      iter->second.accelerator(), this);
+  }
+}
+
+void ExtensionCommandsGlobalRegistry::RemoveExtensionKeybinding(
+    const extensions::Extension* extension,
+    const std::string& command_name) {
+  // This object only handles named commands, not browser/page actions.
+  if (ShouldIgnoreCommand(command_name))
+    return;
+
+  EventTargets::iterator iter = event_targets_.begin();
+  while (iter != event_targets_.end()) {
+    if (iter->second.first != extension->id() ||
+        (!command_name.empty() && (iter->second.second != command_name))) {
+      ++iter;
+      continue;  // Not the extension or command we asked for.
+    }
+
+    LOG(ERROR) << "Removing keybinding for " << extension->name().c_str()

[Yoyo Zhou, 2013/10/03 22:08:50]

ditto

[Finnur, 2013/10/04 17:57:02]

Done.

+               << " " << command_name.c_str();
+
+    GlobalShortcutListener::GetInstance()->UnregisterAccelerator(
+        iter->first, this);
+
+    EventTargets::iterator old = iter++;
+    event_targets_.erase(old);
+
+    // If a specific command_name was requested, it has now been deleted so
+    // no further work is required.
+    if (!command_name.empty())
+      break;
+  }
+}
+
+void ExtensionCommandsGlobalRegistry::OnKeyPressed(
+    const ui::Accelerator& accelerator) {
+  EventTargets::iterator it = event_targets_.find(accelerator);
+  if (it == event_targets_.end()) {
+    NOTREACHED();  // Shouldn't get this event for something not registered.
+    return;
+  }
+
+  CommandExecuted(it->second.first, it->second.second);
+}
+
+}  // namespace extensions