Conflict detection for Extension Keybinding.

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

Index: chrome/browser/ui/views/extensions/extension_installed_bubble.cc
===================================================================
--- chrome/browser/ui/views/extensions/extension_installed_bubble.cc	(revision 133458)
+++ chrome/browser/ui/views/extensions/extension_installed_bubble.cc	(working copy)
@@ -143,7 +143,8 @@
     switch (type_) {
       case ExtensionInstalledBubble::BROWSER_ACTION: {
         const Extension::ExtensionKeybinding* browser_action_command =
-            extension->browser_action_command();
+            ExtensionKeybindingRegistry::GetActiveBrowserActionCommand(
+                browser_->profile(), extension->id());
         if (!browser_action_command) {
           info_ = new views::Label(l10n_util::GetStringUTF16(
               IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO));
@@ -153,6 +154,7 @@
               IDS_EXTENSION_INSTALLED_BROWSER_ACTION_INFO_WITH_SHORTCUT,
               browser_action_command->accelerator().GetShortcutText()));
         }
+
         info_->SetFont(font);
         info_->SetMultiLine(true);
         info_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
@@ -161,7 +163,8 @@
       }
       case ExtensionInstalledBubble::PAGE_ACTION: {
         const Extension::ExtensionKeybinding* page_action_command =
-            extension->page_action_command();
+            ExtensionKeybindingRegistry::GetActivePageActionCommand(
+                browser_->profile(), extension->id());
         if (!page_action_command) {
           info_ = new views::Label(l10n_util::GetStringUTF16(
               IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO));