chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm - Issue 23812010: Implement first part of supporting global extension commands.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

Issue 23812010: Implement first part of supporting global extension commands. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: gclient sync Created 7 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h ('k') | chrome/browser/ui/gtk/extensions/extension_keybinding_registry_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

diff --git a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

index 839635a1ff7a096a548f538226fd0dcc80e193d8..54b0d3d375e4784ee7ac9ba35c14ad5d2f15b6e1 100644

--- a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

+++ b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm

@@ -84,6 +84,7 @@ void ExtensionKeybindingRegistryCocoa::AddExtensionKeybinding(

command_service->GetNamedCommands(

extension->id(),

extensions::CommandService::ACTIVE_ONLY,

+ extensions::CommandService::REGULAR,

&commands);

for (extensions::CommandMap::const_iterator iter = commands.begin();

@@ -135,14 +136,7 @@ void ExtensionKeybindingRegistryCocoa::AddExtensionKeybinding(

}

-void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybinding(

- const extensions::Extension* extension,

+void ExtensionKeybindingRegistryCocoa::RemoveExtensionKeybindingImpl(

+ const ui::Accelerator& accelerator,

const std::string& command_name) {

- EventTargets::iterator iter = event_targets_.begin();

- while (iter != event_targets_.end()) {

- EventTargets::iterator old = iter++;

- if (old->second.first == extension->id() &&

- (command_name.empty() || (old->second.second == command_name)))

- event_targets_.erase(old);

- }

}