chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.mm - Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended

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 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 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/views/extensions/extension_keybinding_registry_views.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 8cbe6f0a7c40fdc971ee16d7850fa507131e1961..541b9655b138919d263ae28b2b5ee43167724053 100644

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

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

@@ -16,14 +16,6 @@

namespace values = extensions::manifest_values;

-// static

-void extensions::ExtensionKeybindingRegistry::SetShortcutHandlingSuspended(

- bool suspended) {

- ExtensionKeybindingRegistryCocoa::set_shortcut_handling_suspended(suspended);

-bool ExtensionKeybindingRegistryCocoa::shortcut_handling_suspended_ = false;

ExtensionKeybindingRegistryCocoa::ExtensionKeybindingRegistryCocoa(

Profile* profile,

gfx::NativeWindow window,

@@ -41,7 +33,7 @@ ExtensionKeybindingRegistryCocoa::~ExtensionKeybindingRegistryCocoa() {

bool ExtensionKeybindingRegistryCocoa::ProcessKeyEvent(

const content::NativeWebKeyboardEvent& event,

ui::AcceleratorManager::HandlerPriority priority) {

- if (shortcut_handling_suspended_)

+ if (shortcut_handling_suspended())

return false;

ui::Accelerator accelerator =