content/browser/browser_main_loop.cc - Issue 408973002: mac: Load the system hotkeys after launch. (reland)

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: content/browser/browser_main_loop.cc

Issue 408973002: mac: Load the system hotkeys after launch. (reland) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add more unit tests. Created 6 years, 5 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:

Index: content/browser/browser_main_loop.cc

diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc

index 6b5cdd41436e75645bb8e4a9ab96a9d39574fefd..ce7e2248dab0f03da04c60a03e8717e58dfcc6be 100644

--- a/content/browser/browser_main_loop.cc

+++ b/content/browser/browser_main_loop.cc

@@ -86,6 +86,7 @@

#if defined(OS_MACOSX) && !defined(OS_IOS)

#include "content/browser/bootstrap_sandbox_mac.h"

+#include "content/browser/cocoa/system_hotkey_helper_mac.h"

#include "content/browser/theme_helper_mac.h"

#endif

@@ -1048,6 +1049,7 @@ int BrowserMainLoop::BrowserThreadsStarted() {

#if defined(OS_MACOSX)

ThemeHelperMac::GetInstance();

+ SystemHotkeyHelperMac::GetInstance()->DeferredLoadSystemHotkeys();

if (ShouldEnableBootstrapSandbox()) {

TRACE_EVENT0("startup",

"BrowserMainLoop::BrowserThreadsStarted:BootstrapSandbox");