Conflict detection for Extension Keybinding.

chrome/browser/ui/views/extensions/extension_installed_bubble.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/views/extensions/extension_installed_bubble.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 125 matching lines @@
     heading_->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
     heading_->SetMultiLine(true);
     heading_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(heading_);
 
     bool has_keybinding = false;
 
     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));
         } else {
           has_keybinding = true;
           info_ = new views::Label(l10n_util::GetStringFUTF16(
               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);
         AddChildView(info_);
         break;
       }
       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));
         } else {
           has_keybinding = true;
           info_ = new views::Label(l10n_util::GetStringFUTF16(
               IDS_EXTENSION_INSTALLED_PAGE_ACTION_INFO_WITH_SHORTCUT,
               page_action_command->accelerator().GetShortcutText()));
         }
 
@@ skipping 290 matching lines @@
 }
 
 void ExtensionInstalledBubble::WindowClosing() {
   if (extension_ && type_ == PAGE_ACTION) {
     BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser_);
     browser_view->GetLocationBarView()->SetPreviewEnabledPageAction(
         extension_->page_action(),
         false);  // preview_enabled
   }
 }