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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Fix Mac Created 5 years, 11 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 unified diff | Download patch
OLDNEW
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/browser/ui/extensions/accelerator_priority.h" 11 #include "chrome/browser/ui/extensions/accelerator_priority.h"
12 #include "content/public/browser/notification_service.h" 12 #include "content/public/browser/notification_service.h"
13 #include "extensions/common/extension.h" 13 #include "extensions/common/extension.h"
14 #include "extensions/common/manifest_constants.h" 14 #include "extensions/common/manifest_constants.h"
15 #include "ui/content_accelerators/accelerator_util.h" 15 #include "ui/content_accelerators/accelerator_util.h"
16 16
17 namespace values = extensions::manifest_values; 17 namespace values = extensions::manifest_values;
18 18
19 // static
20 void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(
21 bool suspended) {
22 ExtensionKeybindingRegistryCocoa::set_shortcut_handling_suspended(suspended);
23 }
24
25 bool ExtensionKeybindingRegistryCocoa::shortcut_handling_suspended_ = false;
26
27 ExtensionKeybindingRegistryCocoa::ExtensionKeybindingRegistryCocoa( 19 ExtensionKeybindingRegistryCocoa::ExtensionKeybindingRegistryCocoa(
28 Profile* profile, 20 Profile* profile,
29 gfx::NativeWindow window, 21 gfx::NativeWindow window,
30 ExtensionFilter extension_filter, 22 ExtensionFilter extension_filter,
31 Delegate* delegate) 23 Delegate* delegate)
32 : ExtensionKeybindingRegistry(profile, extension_filter, delegate), 24 : ExtensionKeybindingRegistry(profile, extension_filter, delegate),
33 profile_(profile), 25 profile_(profile),
34 window_(window) { 26 window_(window) {
35 Init(); 27 Init();
36 } 28 }
37 29
38 ExtensionKeybindingRegistryCocoa::~ExtensionKeybindingRegistryCocoa() { 30 ExtensionKeybindingRegistryCocoa::~ExtensionKeybindingRegistryCocoa() {
39 } 31 }
40 32
41 bool ExtensionKeybindingRegistryCocoa::ProcessKeyEvent( 33 bool ExtensionKeybindingRegistryCocoa::ProcessKeyEvent(
42 const content::NativeWebKeyboardEvent& event, 34 const content::NativeWebKeyboardEvent& event,
43 ui::AcceleratorManager::HandlerPriority priority) { 35 ui::AcceleratorManager::HandlerPriority priority) {
44 if (shortcut_handling_suspended_) 36 if (shortcut_handling_suspended())
45 return false; 37 return false;
46 38
47 ui::Accelerator accelerator = 39 ui::Accelerator accelerator =
48 ui::GetAcceleratorFromNativeWebKeyboardEvent(event); 40 ui::GetAcceleratorFromNativeWebKeyboardEvent(event);
49 41
50 std::string extension_id; 42 std::string extension_id;
51 std::string command_name; 43 std::string command_name;
52 if (!GetFirstTarget(accelerator, &extension_id, &command_name)) 44 if (!GetFirstTarget(accelerator, &extension_id, &command_name))
53 return false; 45 return false;
54 46
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 extension->id(), 124 extension->id(),
133 page_action.command_name()); 125 page_action.command_name());
134 } 126 }
135 } 127 }
136 } 128 }
137 129
138 void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybindingImpl( 130 void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybindingImpl(
139 const ui::Accelerator& accelerator, 131 const ui::Accelerator& accelerator,
140 const std::string& command_name) { 132 const std::string& command_name) {
141 } 133 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698