content/browser/browser_main_loop.cc - Issue 1899323002: Add mash shelf application id support.

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 1899323002: Add mash shelf application id support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address simpler comments. Created 4 years, 8 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 1f77258d8df738cac0a5efbef2df7b78dd3e1711..03ec04cb42fa721a025e817c1a76c876763bff1d 100644

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

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

@@ -1171,9 +1171,11 @@ int BrowserMainLoop::BrowserThreadsStarted() {

MojoShellConnectionImpl::Get()->BindToRequestFromCommandLine();

}

#if defined(MOJO_SHELL_CLIENT) && defined(USE_AURA)

- if (MojoShellConnection::Get()) {

+ MojoShellConnection* mojo_shell_connection = MojoShellConnection::Get();

+ if (mojo_shell_connection) {

views::WindowManagerConnection::Create(

- MojoShellConnection::Get()->GetConnector());

+ mojo_shell_connection->GetConnector(),

+ mojo_shell_connection->GetIdentity());

}

#endif

}