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/command_service.h" | 7 #include "chrome/browser/extensions/api/commands/command_service.h" |
8 #include "chrome/browser/extensions/api/commands/command_service_factory.h" | 8 #include "chrome/browser/extensions/api/commands/command_service_factory.h" |
9 #include "chrome/browser/extensions/browser_event_router.h" | 9 #include "chrome/browser/extensions/browser_event_router.h" |
10 #include "chrome/browser/extensions/extension_keybinding_registry.h" | 10 #include "chrome/browser/extensions/extension_keybinding_registry.h" |
11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/common/extensions/extension.h" | 13 #include "chrome/common/extensions/extension.h" |
14 #include "ui/views/focus/focus_manager.h" | 14 #include "ui/views/focus/focus_manager.h" |
15 | 15 |
16 // static | 16 // static |
17 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( | 17 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( |
18 bool suspended) { | 18 bool suspended) { |
19 views::FocusManager::set_shortcut_handling_suspended(suspended); | 19 views::FocusManager::set_shortcut_handling_suspended(suspended); |
20 } | 20 } |
21 | 21 |
22 ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews( | 22 ExtensionKeybindingRegistryViews::ExtensionKeybindingRegistryViews( |
23 Profile* profile, views::FocusManager* focus_manager) | 23 Profile* profile, |
24 : ExtensionKeybindingRegistry(profile), | 24 views::FocusManager* focus_manager, |
| 25 ExtensionFilter extension_filter) |
| 26 : ExtensionKeybindingRegistry(profile, extension_filter), |
25 profile_(profile), | 27 profile_(profile), |
26 focus_manager_(focus_manager) { | 28 focus_manager_(focus_manager) { |
27 Init(); | 29 Init(); |
28 } | 30 } |
29 | 31 |
30 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() { | 32 ExtensionKeybindingRegistryViews::~ExtensionKeybindingRegistryViews() { |
31 EventTargets::const_iterator iter; | 33 EventTargets::const_iterator iter; |
32 for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter) | 34 for (iter = event_targets_.begin(); iter != event_targets_.end(); ++iter) |
33 focus_manager_->UnregisterAccelerator(iter->first, this); | 35 focus_manager_->UnregisterAccelerator(iter->first, this); |
34 } | 36 } |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 | 97 |
96 service->browser_event_router()->CommandExecuted( | 98 service->browser_event_router()->CommandExecuted( |
97 profile_, it->second.first, it->second.second); | 99 profile_, it->second.first, it->second.second); |
98 | 100 |
99 return true; | 101 return true; |
100 } | 102 } |
101 | 103 |
102 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const { | 104 bool ExtensionKeybindingRegistryViews::CanHandleAccelerators() const { |
103 return true; | 105 return true; |
104 } | 106 } |
OLD | NEW |