Implement first part of supporting global extension commands.

chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.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/ui/gtk/extensions/extension_keybinding_registry_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/extensions/api/commands/command_service.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 46 matching lines @@
 
 void ExtensionKeybindingRegistryGtk::AddExtensionKeybinding(
     const extensions::Extension* extension,
     const std::string& command_name) {
   extensions::CommandService* command_service =
       extensions::CommandService::Get(profile_);
   extensions::CommandMap commands;
   command_service->GetNamedCommands(
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
+          extensions::CommandService::REGULAR,
           &commands);
 
   for (extensions::CommandMap::const_iterator iter = commands.begin();
        iter != commands.end(); ++iter) {
     if (!command_name.empty() && (iter->second.command_name() != command_name))
       continue;
 
     ui::Accelerator accelerator(iter->second.accelerator());
     event_targets_[accelerator] =
         std::make_pair(extension->id(), iter->second.command_name());
@@ skipping 43 matching lines @@
           extension->id(),
           extensions::CommandService::ACTIVE_ONLY,
           &script_badge,
           NULL)) {
     ui::Accelerator accelerator(script_badge.accelerator());
     event_targets_[accelerator] =
         std::make_pair(extension->id(), script_badge.command_name());
   }
 }
 
-void ExtensionKeybindingRegistryGtk::RemoveExtensionKeybinding(
-    const extensions::Extension* extension,
+void ExtensionKeybindingRegistryGtk::RemoveExtensionKeybindingImpl(
+    const ui::Accelerator& accelerator,
     const std::string& command_name) {
-  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.
-    }
-
-    // On GTK, unlike Windows, the Event Targets contain all events but we must
-    // only unregister the ones we registered targets for.
-    if (!ShouldIgnoreCommand(iter->second.second)) {
-      gtk_accel_group_disconnect_key(
-          accel_group_,
-          ui::GetGdkKeyCodeForAccelerator(iter->first),
-          ui::GetGdkModifierForAccelerator(iter->first));
-    }
-
-    EventTargets::iterator old = iter++;
-    event_targets_.erase(old);
+  // On GTK, unlike Windows, the Event Targets contain all events but we must
+  // only unregister the ones we registered targets for.
+  if (!ShouldIgnoreCommand(command_name)) {
+    gtk_accel_group_disconnect_key(
+        accel_group_,
+        ui::GetGdkKeyCodeForAccelerator(accelerator),
+        ui::GetGdkModifierForAccelerator(accelerator));
   }
 }
 
 gboolean ExtensionKeybindingRegistryGtk::OnGtkAccelerator(
     GtkAccelGroup* group,
     GObject* acceleratable,
     guint keyval,
     GdkModifierType modifier) {
   ui::Accelerator accelerator = ui::AcceleratorForGdkKeyCodeAndModifier(
       keyval, modifier);
 
   EventTargets::iterator it = event_targets_.find(accelerator);
   if (it == event_targets_.end()) {
     NOTREACHED();  // Shouldn't get this event for something not registered.
     return FALSE;
   }
 
   CommandExecuted(it->second.first, it->second.second);
   return TRUE;
 }