chrome/app/mash/mash_runner.cc - Issue 2419723002: Move services/shell to services/service_manager

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/mash_runner.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)

Patch Set: rebase Created 4 years, 2 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/mash_runner.cc

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

index 5793321c00b0a409610c66a8038ebe28fca2d0e4..7b7f7080a7c3a8ec31b3fdf85502c4be0ee832f9 100644

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

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

@@ -22,15 +22,15 @@

#include "mash/package/mash_packaged_service.h"

#include "mojo/public/cpp/bindings/binding_set.h"

#include "services/catalog/public/interfaces/catalog.mojom.h"

-#include "services/shell/background/background_shell.h"

-#include "services/shell/native_runner_delegate.h"

-#include "services/shell/public/cpp/connector.h"

-#include "services/shell/public/cpp/identity.h"

-#include "services/shell/public/cpp/service.h"

-#include "services/shell/public/cpp/service_context.h"

-#include "services/shell/public/interfaces/service_factory.mojom.h"

-#include "services/shell/runner/common/switches.h"

-#include "services/shell/runner/host/child_process_base.h"

+#include "services/service_manager/background/background_shell.h"

+#include "services/service_manager/native_runner_delegate.h"

+#include "services/service_manager/public/cpp/connector.h"

+#include "services/service_manager/public/cpp/identity.h"

+#include "services/service_manager/public/cpp/service.h"

+#include "services/service_manager/public/cpp/service_context.h"

+#include "services/service_manager/public/interfaces/service_factory.mojom.h"

+#include "services/service_manager/runner/common/switches.h"

+#include "services/service_manager/runner/host/child_process_base.h"

#include "ui/base/resource/resource_bundle.h"

#include "ui/base/ui_base_paths.h"

#include "ui/base/ui_base_switches.h"

« no previous file with comments | « chrome/app/mash/mash_runner.h ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »