chrome/browser/ui/views/apps/chrome_native_app_window_views.cc - 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/views/apps/chrome_native_app_window_views.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2

Patch Set: Observe widget to cleanup event monitor 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.mm ('k') | chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h » ('j') | chrome/browser/ui/views/extensions/extension_keybinding_registry_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

index 4973d857c8f6a8b71001def97aa73a52e54cd7de..4e16a697c1aff2088adc69e7ac38373067d19337 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views.cc

@@ -710,7 +710,7 @@ void ChromeNativeAppWindowViews::InitializeWindow(

}

extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(

Profile::FromBrowserContext(app_window->browser_context()),

- widget()->GetFocusManager(),

+ widget(),

extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,

NULL));

}