Polish the keybinding implementation a bit.

chrome/browser/ui/gtk/browser_actions_toolbar_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/browser_actions_toolbar_gtk.h"
 
 #include <algorithm>
 #include <gtk/gtk.h>
 #include <vector>
 
@@ skipping 355 matching lines @@
 
   // The handler for when the browser action is realized. |user_data| contains a
   // pointer to the BrowserAction shown.
   static void OnRealize(GtkWidget* widget, void* user_data) {
     BrowserActionButton* button = static_cast<BrowserActionButton*>(user_data);
     button->ConnectBrowserActionPopupAccelerator();
   }
 
   // Connect the accelerator for the browser action popup.
   void ConnectBrowserActionPopupAccelerator() {
-    // Iterate through all the keybindings and see if one is assigned to the
-    // browserAction.
-    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::kBrowserActionKeybindingEvent)
-        continue;
-
+    const Extension::ExtensionKeybinding* command =
+        extension_->browser_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()));
 
       gfx::NativeWindow window =
           toolbar_->browser()->window()->GetNativeHandle();
       accel_group_ = gtk_accel_group_new();
       gtk_window_add_accel_group(window, accel_group_);
 
       gtk_accel_group_connect(
           accel_group_,
           keybinding_.get()->GetGdkKeyCode(),
           keybinding_.get()->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;
     }
   }
 
   // Disconnect the accelerator for the browser action popup and delete clean up
   // the accelerator group registration.
   void DisconnectBrowserActionPopupAccelerator() {
     if (accel_group_) {
       gfx::NativeWindow window =
           toolbar_->browser()->window()->GetNativeHandle();
       gtk_accel_group_disconnect_key(
@@ skipping 663 matching lines @@
 
   menu->PopupAsContext(gfx::Point(event->x_root, event->y_root),
                        event->time);
   return TRUE;
 }
 
 void BrowserActionsToolbarGtk::OnButtonShowOrHide(GtkWidget* sender) {
   if (!resize_animation_.is_animating())
     UpdateChevronVisibility();
 }