Conflict detection for Extension Keybinding.

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 "chrome/browser/extensions/extension_browser_event_router.h"
+#include "chrome/browser/extensions/extension_command_service.h"
+#include "chrome/browser/extensions/extension_command_service_factory.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 
 ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk(
     Profile* profile, gfx::NativeWindow window)
     : ExtensionKeybindingRegistry(profile),
       profile_(profile),
       window_(window),
@@ skipping 17 matching lines @@
     const GdkEventKey* event) const {
   ui::AcceleratorGtk accelerator(ui::WindowsKeyCodeForGdkKeyCode(event->keyval),
                                  event->state & GDK_SHIFT_MASK,
                                  event->state & GDK_CONTROL_MASK,
                                  event->state & GDK_MOD1_MASK);
   return event_targets_.find(accelerator) != event_targets_.end();
 }
 
 void ExtensionKeybindingRegistryGtk::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).
+  ExtensionCommandService* command_service =
+      ExtensionCommandServiceFactory::GetForProfile(profile_);
+  const Extension::CommandMap& commands =
+      command_service->GetActiveNamedCommands(extension->id());
   Extension::CommandMap::const_iterator iter = commands.begin();
   for (; iter != commands.end(); ++iter) {
     ui::AcceleratorGtk accelerator(iter->second.accelerator().key_code(),
                                    iter->second.accelerator().IsShiftDown(),
                                    iter->second.accelerator().IsCtrlDown(),
                                    iter->second.accelerator().IsAltDown());
     event_targets_[accelerator] =
         std::make_pair(extension->id(), iter->second.command_name());
 
     if (ShouldIgnoreCommand(iter->second.command_name()))
@@ skipping 49 matching lines @@
   if (it == event_targets_.end()) {
     NOTREACHED();  // Shouldn't get this event for something not registered.
     return FALSE;
   }
 
   service->browser_event_router()->CommandExecuted(
       profile_, it->second.first, it->second.second);
 
   return TRUE;
 }