chrome/app/mash/embedded_services.cc - Issue 2916823002: Move Mus into chrome's process when running with --mus.

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/app/mash/embedded_services.cc

Issue 2916823002: Move Mus into chrome's process when running with --mus.

Patch Set: Undo Screen TLS change, don't use Screen::GetScreen() in Mus. Created 3 years, 6 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: chrome/app/mash/embedded_services.cc

diff --git a/chrome/app/mash/embedded_services.cc b/chrome/app/mash/embedded_services.cc

index 88f5152aa5fd36d5c32dbd3811331f2fb8c7487d..090ce3fcd2d7ece372b44bd8a4743dcc460c449c 100644

--- a/chrome/app/mash/embedded_services.cc

+++ b/chrome/app/mash/embedded_services.cc

@@ -46,7 +46,7 @@ std::unique_ptr<service_manager::Service> CreateEmbeddedMashService(

if (service_name == mash::session::mojom::kServiceName)

return base::MakeUnique<mash::session::Session>();

if (service_name == ui::mojom::kServiceName)

- return base::MakeUnique<ui::Service>();

+ return base::MakeUnique<ui::Service>(nullptr, nullptr);

if (service_name == mash::quick_launch::mojom::kServiceName)

return base::MakeUnique<mash::quick_launch::QuickLaunch>();

if (service_name == mash::task_viewer::mojom::kServiceName)