Polish the keybinding implementation a bit.

chrome/browser/ui/views/browser_actions_container.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/browser_actions_container.h"
 
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 98 matching lines @@
                          gfx::Size(Extension::kBrowserActionIconMaxSize,
                                    Extension::kBrowserActionIconMaxSize),
                          ImageLoadingTracker::DONT_CACHE);
     } else {
       // Set the icon to be the default extensions icon.
       default_icon_ = *ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_EXTENSIONS_FAVICON).ToSkBitmap();
       UpdateState();
     }
 
-    // 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) {
-        keybinding_.reset(new ui::Accelerator(commands[i].accelerator()));
-        panel_->GetFocusManager()->RegisterAccelerator(
-            *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
-        break;
-      }
+    std::vector<Extension::ExtensionKeybinding> browser_action_command;
+    extension_->GetCommandByType(Extension::ExtensionKeybinding::BROWSER_ACTION,

[Aaron Boodman, 2012/03/21 21:05:04]

Can you change Extension to store these commands in a more easily accessible
form during parse?

So that you can just do: extension->browser_action_command(),
extension->page_action_command(), and extension->named_commands() or something.

The named_commands field probably makes sense to be a map.

+                                 &browser_action_command);
+    if (!browser_action_command.empty()) {
+      Extension::ExtensionKeybinding* command = &browser_action_command[0];
+      keybinding_.reset(new ui::Accelerator(command->accelerator()));
+      panel_->GetFocusManager()->RegisterAccelerator(
+          *keybinding_.get(), ui::AcceleratorManager::kHighPriority, this);
     }
   }
 
   MenuButton::ViewHierarchyChanged(is_add, parent, child);
 }
 
 void BrowserActionButton::ButtonPressed(views::Button* sender,
                                         const views::Event& event) {
   panel_->OnBrowserActionExecuted(this, false);
 }
@@ skipping 989 matching lines @@
   }
 }
 
 bool BrowserActionsContainer::ShouldDisplayBrowserAction(
     const Extension* extension) {
   // Only display incognito-enabled extensions while in incognito mode.
   return
       (!profile_->IsOffTheRecord() ||
        profile_->GetExtensionService()->IsIncognitoEnabled(extension->id()));
 }