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/gtk/extensions/extension_keybinding_registry_gtk.h" | 5 #include "chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.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_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
11 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
12 #include "chrome/common/extensions/extension.h" | 12 #include "chrome/common/extensions/extension.h" |
13 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" | 13 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" |
14 | 14 |
15 // static | 15 // static |
16 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( | 16 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( |
17 bool suspended) { | 17 bool suspended) { |
18 ExtensionKeybindingRegistryGtk::set_shortcut_handling_suspended(suspended); | 18 ExtensionKeybindingRegistryGtk::set_shortcut_handling_suspended(suspended); |
19 } | 19 } |
20 | 20 |
21 bool ExtensionKeybindingRegistryGtk::shortcut_handling_suspended_ = false; | 21 bool ExtensionKeybindingRegistryGtk::shortcut_handling_suspended_ = false; |
22 | 22 |
23 ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk( | 23 ExtensionKeybindingRegistryGtk::ExtensionKeybindingRegistryGtk( |
24 Profile* profile, gfx::NativeWindow window) | 24 Profile* profile, gfx::NativeWindow window, |
25 : ExtensionKeybindingRegistry(profile), | 25 ExtensionFilter extension_filter) |
| 26 : ExtensionKeybindingRegistry(profile, extension_filter), |
26 profile_(profile), | 27 profile_(profile), |
27 window_(window), | 28 window_(window), |
28 accel_group_(NULL) { | 29 accel_group_(NULL) { |
29 Init(); | 30 Init(); |
30 } | 31 } |
31 | 32 |
32 ExtensionKeybindingRegistryGtk::~ExtensionKeybindingRegistryGtk() { | 33 ExtensionKeybindingRegistryGtk::~ExtensionKeybindingRegistryGtk() { |
33 if (accel_group_) { | 34 if (accel_group_) { |
34 gtk_accel_group_disconnect(accel_group_, | 35 gtk_accel_group_disconnect(accel_group_, |
35 NULL); // Remove all closures. | 36 NULL); // Remove all closures. |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
174 if (it == event_targets_.end()) { | 175 if (it == event_targets_.end()) { |
175 NOTREACHED(); // Shouldn't get this event for something not registered. | 176 NOTREACHED(); // Shouldn't get this event for something not registered. |
176 return FALSE; | 177 return FALSE; |
177 } | 178 } |
178 | 179 |
179 service->browser_event_router()->CommandExecuted( | 180 service->browser_event_router()->CommandExecuted( |
180 profile_, it->second.first, it->second.second); | 181 profile_, it->second.first, it->second.second); |
181 | 182 |
182 return TRUE; | 183 return TRUE; |
183 } | 184 } |
OLD | NEW |