Conflict detection for Extension Keybinding.

chrome/browser/ui/views/browser_actions_container.cc

Index: chrome/browser/ui/views/browser_actions_container.cc
===================================================================
--- chrome/browser/ui/views/browser_actions_container.cc	(revision 134889)
+++ chrome/browser/ui/views/browser_actions_container.cc	(working copy)
@@ -9,6 +9,8 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.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_context_menu_model.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -118,8 +120,11 @@
       UpdateState();
     }
 
+    ExtensionCommandService* command_service =
+        ExtensionCommandServiceFactory::GetForProfile(
+            panel_->browser()->profile());
     const Extension::ExtensionKeybinding* browser_action_command =
-        extension_->browser_action_command();
+        command_service->GetActiveBrowserActionCommand(extension_->id());
     if (browser_action_command) {
       keybinding_.reset(new ui::Accelerator(
           browser_action_command->accelerator()));
@@ -308,7 +313,6 @@
 BrowserActionButton::~BrowserActionButton() {
 }
 
-
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionView