content/browser/mojo/mojo_shell_context.cc - Issue 2131493002: ShellConnection -> ServiceContext

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/mojo/mojo_shell_context.cc

Issue 2131493002: ShellConnection -> ServiceContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@st

Patch Set: . Created 4 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/mojo/mojo_shell_context.cc

diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc

index 7f4177fd456f1c56c8806746220f4cf0a87d07bb..a7148d1db4ac525934bbfcd9a04d770c8c6b4b1b 100644

--- a/content/browser/mojo/mojo_shell_context.cc

+++ b/content/browser/mojo/mojo_shell_context.cc

@@ -267,11 +267,10 @@ MojoShellContext::MojoShellContext() {

mojo::edk::SetParentPipeHandleFromCommandLine();

request = shell::GetServiceRequestFromCommandLine();

} else {

- service_manager_.reset(

- new shell::ServiceManager(std::move(native_runner_factory),

- catalog_->TakeService()));

- request = service_manager_->StartEmbedderService(

- kBrowserMojoApplicationName);

+ service_manager_.reset(new shell::ServiceManager(

+ std::move(native_runner_factory), catalog_->TakeService()));

+ request =

+ service_manager_->StartEmbedderService(kBrowserMojoApplicationName);

}

MojoShellConnection::SetForProcess(

MojoShellConnection::Create(std::move(request)));