services/shell/service_manager.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: services/shell/service_manager.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: services/shell/service_manager.cc

diff --git a/services/shell/service_manager.cc b/services/shell/service_manager.cc

index 908156272c41a13c23c4ae9e4a22b6b47a58501a..70aca84c9d0457827d6043fdff75d8a878031abf 100644

--- a/services/shell/service_manager.cc

+++ b/services/shell/service_manager.cc

@@ -23,7 +23,7 @@

#include "services/shell/connect_util.h"

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

#include "services/shell/public/cpp/names.h"

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

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

#include "services/shell/public/interfaces/connector.mojom.h"

#include "services/shell/public/interfaces/service.mojom.h"

#include "services/shell/public/interfaces/service_manager.mojom.h"

@@ -497,7 +497,7 @@ ServiceManager::ServiceManager(

Identity(), CreateServiceManagerIdentity(), GetPermissiveCapabilities());

instance->StartWithService(std::move(service));

singletons_.insert(kServiceManagerName);

- shell_connection_.reset(new ShellConnection(this, std::move(request)));

+ service_context_.reset(new ServiceContext(this, std::move(request)));

if (catalog)

InitCatalog(std::move(catalog));

« no previous file with comments | « services/shell/service_manager.h ('k') | services/shell/shell_public.gyp » ('j') | no next file with comments »