chrome/browser/ui/cocoa/browser_window_controller.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/browser_window_controller.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/extensions/extension_keybinding_registry.cc ('k') | chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/browser_window_controller.mm

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

index 6b9936924a8d01b402c02bf93e1d2589a4e1b766..c22f121ed44bb8f752ca8d52052e11ee0fcbf843 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm

@@ -20,6 +20,7 @@

#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"

#include "chrome/browser/browser_process.h"

#include "chrome/browser/devtools/devtools_window.h"

+#include "chrome/browser/extensions/extension_commands_global_registry.h"

#include "chrome/browser/fullscreen.h"

#include "chrome/browser/profiles/avatar_menu.h"

#include "chrome/browser/profiles/profile.h"

@@ -625,6 +626,9 @@ using content::WebContents;

// TODO(viettrungluu): For some reason, the above doesn't suffice.

if ([self isInAnyFullscreenMode])

[floatingBarBackingView_ setNeedsDisplay:YES]; // Okay even if nil.

+ extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile())->

+ set_registry_for_active_window(extension_keybinding_registry_.get());

}

- (void)windowDidResignMain:(NSNotification*)notification {

@@ -635,6 +639,9 @@ using content::WebContents;

// TODO(viettrungluu): For some reason, the above doesn't suffice.

if ([self isInAnyFullscreenMode])

[floatingBarBackingView_ setNeedsDisplay:YES]; // Okay even if nil.

+ extensions::ExtensionCommandsGlobalRegistry::Get(browser_->profile())->

+ set_registry_for_active_window(nullptr);

}

// Called when we are activated (when we gain focus).