chrome/browser/extensions/extension_commands_global_registry.cc - Issue 575093003: Revert of Track the active ExtensionKeybindingRegistry and make it available to EventRewriter.

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/extensions/extension_commands_global_registry.cc

Issue 575093003: Revert of Track the active ExtensionKeybindingRegistry and make it available to EventRewriter. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr

Patch Set: Created 6 years, 3 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/extensions/extension_commands_global_registry.h ('k') | chrome/browser/extensions/extension_keybinding_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_commands_global_registry.cc

diff --git a/chrome/browser/extensions/extension_commands_global_registry.cc b/chrome/browser/extensions/extension_commands_global_registry.cc

index a6016dd796734a3f33b444b58047ffb00e2979b5..1982addbe9c5be19b611a1cb0a0d9b452a797cab 100644

--- a/chrome/browser/extensions/extension_commands_global_registry.cc

+++ b/chrome/browser/extensions/extension_commands_global_registry.cc

@@ -16,8 +16,7 @@

: ExtensionKeybindingRegistry(context,

ExtensionKeybindingRegistry::ALL_EXTENSIONS,

NULL),

- browser_context_(context),

- registry_for_active_window_(NULL) {

+ browser_context_(context) {

Init();

}

@@ -57,13 +56,6 @@

bool suspended) {

GlobalShortcutListener::GetInstance()->SetShortcutHandlingSuspended(

suspended);

-bool ExtensionCommandsGlobalRegistry::IsRegistered(

- const ui::Accelerator& accelerator) {

- return (registry_for_active_window() &&

- registry_for_active_window()->IsAcceleratorRegistered(accelerator)) ||

- IsAcceleratorRegistered(accelerator);

}

void ExtensionCommandsGlobalRegistry::AddExtensionKeybinding(