Conflict detection for Extension Keybinding.

chrome/browser/ui/views/location_bar/page_action_image_view.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/location_bar/page_action_image_view.h"
 
 #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"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
@@ skipping 36 matching lines @@
                        ImageLoadingTracker::DONT_CACHE);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(
                      owner_->profile()->GetOriginalProfile()));
 
   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(
         *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
   }
 }
 
 PageActionImageView::~PageActionImageView() {
   if (keybinding_.get() && owner_->GetFocusManager())
     owner_->GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
@@ skipping 193 matching lines @@
   const Extension* unloaded_extension =
       content::Details<UnloadedExtensionInfo>(details)->extension;
   if (page_action_ == unloaded_extension ->page_action())
     owner_->UpdatePageActions();
 }
 
 void PageActionImageView::HidePopup() {
   if (popup_)
     popup_->GetWidget()->Close();
 }