Conflict detection for Extension Keybinding.

chrome/browser/ui/views/location_bar/page_action_image_view.cc

Index: chrome/browser/ui/views/location_bar/page_action_image_view.cc
===================================================================
--- chrome/browser/ui/views/location_bar/page_action_image_view.cc	(revision 133458)
+++ chrome/browser/ui/views/location_bar/page_action_image_view.cc	(working copy)
@@ -7,6 +7,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_context_menu_model.h"
+#include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/platform_util.h"
@@ -63,7 +64,8 @@
   set_accessibility_focusable(true);
 
   const Extension::ExtensionKeybinding* page_action_command =
-      extension->page_action_command();
+      ExtensionKeybindingRegistry::GetActivePageActionCommand(
+          browser_->profile(), extension->id());
   if (page_action_command) {
     keybinding_.reset(new ui::Accelerator(page_action_command->accelerator()));
     owner_->GetFocusManager()->RegisterAccelerator(