| 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/cocoa/extensions/extension_keybinding_registry_cocoa
.h" | 5 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa
.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
| 8 #include "chrome/browser/extensions/api/commands/command_service.h" | 8 #include "chrome/browser/extensions/api/commands/command_service.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/common/extensions/extension.h" | |
| 12 #include "content/public/browser/native_web_keyboard_event.h" | 11 #include "content/public/browser/native_web_keyboard_event.h" |
| 13 #include "content/public/browser/notification_service.h" | 12 #include "content/public/browser/notification_service.h" |
| 13 #include "extensions/common/extension.h" |
| 14 #include "extensions/common/manifest_constants.h" | 14 #include "extensions/common/manifest_constants.h" |
| 15 | 15 |
| 16 namespace values = extensions::manifest_values; | 16 namespace values = extensions::manifest_values; |
| 17 | 17 |
| 18 // static | 18 // static |
| 19 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( | 19 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended( |
| 20 bool suspended) { | 20 bool suspended) { |
| 21 ExtensionKeybindingRegistryCocoa::set_shortcut_handling_suspended(suspended); | 21 ExtensionKeybindingRegistryCocoa::set_shortcut_handling_suspended(suspended); |
| 22 } | 22 } |
| 23 | 23 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 133 ui::Accelerator accelerator(script_badge.accelerator()); | 133 ui::Accelerator accelerator(script_badge.accelerator()); |
| 134 event_targets_[accelerator] = | 134 event_targets_[accelerator] = |
| 135 std::make_pair(extension->id(), script_badge.command_name()); | 135 std::make_pair(extension->id(), script_badge.command_name()); |
| 136 } | 136 } |
| 137 } | 137 } |
| 138 | 138 |
| 139 void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybindingImpl( | 139 void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybindingImpl( |
| 140 const ui::Accelerator& accelerator, | 140 const ui::Accelerator& accelerator, |
| 141 const std::string& command_name) { | 141 const std::string& command_name) { |
| 142 } | 142 } |
| OLD | NEW |