Polish the keybinding implementation a bit.

chrome/browser/ui/gtk/location_bar_view_gtk.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/gtk/location_bar_view_gtk.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1616 matching lines @@
   return true;
 }
 
 void LocationBarViewGtk::PageActionViewGtk::ConnectPageActionAccelerator() {
   const ExtensionSet* extensions = owner_->browser()->profile()->
       GetExtensionService()->extensions();
   const Extension* extension =
       extensions->GetByID(page_action_->extension_id());
   window_ = owner_->browser()->window()->GetNativeHandle();
 
-  // 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)
-      continue;
-
+  const Extension::ExtensionKeybinding* command =
+      extension->page_action_command();
+  if (command) {
     // Found the browser action shortcut command, register it.
     keybinding_.reset(new ui::AcceleratorGtk(
-        commands[i].accelerator().key_code(),
-        commands[i].accelerator().IsShiftDown(),
-        commands[i].accelerator().IsCtrlDown(),
-        commands[i].accelerator().IsAltDown()));
+        command->accelerator().key_code(),
+        command->accelerator().IsShiftDown(),
+        command->accelerator().IsCtrlDown(),
+        command->accelerator().IsAltDown()));
 
     accel_group_ = gtk_accel_group_new();
     gtk_window_add_accel_group(window_, accel_group_);
 
     gtk_accel_group_connect(
         accel_group_,
         keybinding_->GetGdkKeyCode(),
         keybinding_->gdk_modifier_type(),
         GtkAccelFlags(0),
         g_cclosure_new(G_CALLBACK(OnGtkAccelerator), this, NULL));
 
     // Since we've added an accelerator, we'll need to unregister it before
     // the window is closed, so we listen for the window being closed.
     registrar_.Add(this,
                    chrome::NOTIFICATION_WINDOW_CLOSED,
                    content::Source<GtkWindow>(window_));
-    break;
   }
 }
 
 void LocationBarViewGtk::PageActionViewGtk::DisconnectPageActionAccelerator() {
   if (accel_group_) {
     gtk_accel_group_disconnect_key(
         accel_group_,
         keybinding_.get()->GetGdkKeyCode(),
         static_cast<GdkModifierType>(keybinding_.get()->modifiers()));
     gtk_window_remove_accel_group(window_, accel_group_);
@@ skipping 65 matching lines @@
     GdkModifierType modifier,
     void* user_data) {
   PageActionViewGtk* view = static_cast<PageActionViewGtk*>(user_data);
   if (!gtk_widget_get_visible(view->widget()))
     return FALSE;
 
   GdkEventButton event = {};
   event.button = 1;
   return view->OnButtonPressed(view->widget(), &event);
 }