Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3138)

Unified Diff: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc

Issue 9812008: Polish the keybinding implementation a bit. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc
===================================================================
--- chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc (revision 129600)
+++ chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc (working copy)
@@ -28,16 +28,14 @@
const Extension* extension) {
// Add all the keybindings (except pageAction and browserAction, which are
// handled elsewhere).
- const std::vector<Extension::ExtensionKeybinding> commands =
- extension->keybindings();
- for (size_t i = 0; i < commands.size(); ++i) {
- if (ShouldIgnoreCommand(commands[i].command_name()))
- continue;
-
- event_targets_[commands[i].accelerator()] =
- std::make_pair(extension->id(), commands[i].command_name());
+ const Extension::CommandMap& commands = extension->named_commands();
+ Extension::CommandMap::const_iterator iter = commands.begin();
+ for (; iter != commands.end(); ++iter) {
+ event_targets_[iter->second.accelerator()] =
+ std::make_pair(extension->id(), iter->second.command_name());
focus_manager_->RegisterAccelerator(
- commands[i].accelerator(), ui::AcceleratorManager::kHighPriority, this);
+ iter->second.accelerator(),
+ ui::AcceleratorManager::kHighPriority, this);
}
}
« no previous file with comments | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/location_bar/page_action_image_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698