OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" | 5 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views
.h" |
6 | 6 |
7 #include "chrome/browser/extensions/api/commands/extension_command_service.h" | 7 #include "chrome/browser/extensions/api/commands/extension_command_service.h" |
8 #include "chrome/browser/extensions/api/commands/extension_command_service_facto
ry.h" | 8 #include "chrome/browser/extensions/api/commands/extension_command_service_facto
ry.h" |
9 #include "chrome/browser/extensions/extension_browser_event_router.h" | 9 #include "chrome/browser/extensions/extension_browser_event_router.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 } | 21 } |
22 | 22 |
23 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() { | 23 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() { |
24 EventTargets::const_iterator iter; | 24 EventTargets::const_iterator iter; |
25 for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter) | 25 for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter) |
26 focus_manager_->UnregisterAccelerator(iter->first, this); | 26 focus_manager_->UnregisterAccelerator(iter->first, this); |
27 } | 27 } |
28 | 28 |
29 void ExtensionKeybindingRegistryViews::AddExtensionKeybinding( | 29 void ExtensionKeybindingRegistryViews::AddExtensionKeybinding( |
30 const extensions::Extension* extension) { | 30 const extensions::Extension* extension) { |
31 ExtensionCommandService* command_service = | 31 extensions::ExtensionCommandService* command_service = |
32 ExtensionCommandServiceFactory::GetForProfile(profile_); | 32 extensions::ExtensionCommandServiceFactory::GetForProfile(profile_); |
33 // Add all the active keybindings (except page actions and browser actions, | 33 // Add all the active keybindings (except page actions and browser actions, |
34 // which are handled elsewhere). | 34 // which are handled elsewhere). |
35 const extensions::CommandMap& commands = | 35 const extensions::CommandMap& commands = |
36 command_service->GetActiveNamedCommands(extension->id()); | 36 command_service->GetNamedCommands( |
| 37 extension->id(), |
| 38 extensions::ExtensionCommandService::ACTIVE_ONLY); |
37 extensions::CommandMap::const_iterator iter = commands.begin(); | 39 extensions::CommandMap::const_iterator iter = commands.begin(); |
38 for (; iter != commands.end(); ++iter) { | 40 for (; iter != commands.end(); ++iter) { |
39 event_targets_[iter->second.accelerator()] = | 41 event_targets_[iter->second.accelerator()] = |
40 std::make_pair(extension->id(), iter->second.command_name()); | 42 std::make_pair(extension->id(), iter->second.command_name()); |
41 focus_manager_->RegisterAccelerator( | 43 focus_manager_->RegisterAccelerator( |
42 iter->second.accelerator(), | 44 iter->second.accelerator(), |
43 ui::AcceleratorManager::kHighPriority, this); | 45 ui::AcceleratorManager::kHighPriority, this); |
44 } | 46 } |
45 } | 47 } |
46 | 48 |
(...skipping 25 matching lines...) Expand all Loading... |
72 | 74 |
73 service->browser_event_router()->CommandExecuted( | 75 service->browser_event_router()->CommandExecuted( |
74 profile_, it->second.first, it->second.second); | 76 profile_, it->second.first, it->second.second); |
75 | 77 |
76 return true; | 78 return true; |
77 } | 79 } |
78 | 80 |
79 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const { | 81 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const { |
80 return true; | 82 return true; |
81 } | 83 } |
OLD | NEW |