Polish the keybinding implementation a bit.

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_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
@@ skipping 42 matching lines @@
                                  Extension::kPageActionIconMaxSize),
                        ImageLoadingTracker::DONT_CACHE);
   }
 
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED,
                  content::Source<Profile>(
                      owner_->profile()->GetOriginalProfile()));
 
   set_accessibility_focusable(true);
 
-  // Iterate through all the keybindings and see if one is assigned to the
-  // pageAction.
-  const std::vector<Extension::ExtensionKeybinding>& commands =
-      extension->keybindings();
-  for (size_t i = 0; i < commands.size(); ++i) {
-    if (commands[i].command_name() ==
-        extension_manifest_values::kPageActionKeybindingEvent) {
-      keybinding_.reset(new ui::Accelerator(commands[i].accelerator()));
-      owner_->GetFocusManager()->RegisterAccelerator(
-          *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
-      break;
-    }
+  std::vector<Extension::ExtensionKeybinding> page_action_command;
+  extension->GetCommandByType(Extension::ExtensionKeybinding::PAGE_ACTION,
+                              &page_action_command);
+  if (!page_action_command.empty()) {
+    Extension::ExtensionKeybinding* command = &page_action_command[0];
+    keybinding_.reset(new ui::Accelerator(command->accelerator()));
+    owner_->GetFocusManager()->RegisterAccelerator(
+        *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
   }
 }
 
 PageActionImageView::~PageActionImageView() {
   if (keybinding_.get() && owner_->GetFocusManager())
     owner_->GetFocusManager()->UnregisterAccelerator(*keybinding_.get(), this);
 
   if (popup_)
     popup_->GetWidget()->RemoveObserver(this);
   HidePopup();
@@ skipping 196 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();
 }