Conflict detection for Extension Keybinding.

chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc

Index: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
===================================================================
--- chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc	(revision 133458)
+++ chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc	(working copy)
@@ -26,9 +26,10 @@
 
 void ExtensionKeybindingRegistryViews::AddExtensionKeybinding(
     const Extension* extension) {
-  // Add all the keybindings (except pageAction and browserAction, which are
-  // handled elsewhere).
-  const Extension::CommandMap& commands = extension->named_commands();
+  // Add all the active keybindings (except page actions and browser actions,
+  // which are handled elsewhere).
+  const Extension::CommandMap& commands =
+      GetActiveNamedCommands(profile_, extension->id());
   Extension::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
     event_targets_[iter->second.accelerator()] =
@@ -41,12 +42,17 @@
 
 void ExtensionKeybindingRegistryViews::RemoveExtensionKeybinding(
     const Extension* extension) {
-  EventTargets::const_iterator iter;
-  for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter) {
-    if (iter->second.first != extension->id())
+  EventTargets::iterator iter = event_targets_.begin();
+  while (iter != event_targets_.end()) {
+    if (iter->second.first != extension->id()) {
+      ++iter;
       continue;  // Not the extension we asked for.
+    }
 
     focus_manager_->UnregisterAccelerator(iter->first, this);
+
+    EventTargets::iterator old = iter++;
+    event_targets_.erase(old);
   }
 }