mojo/public/cpp/application/lib/service_connector.cc - Issue 337533002: Introduce internal::ServiceRegistry to prepare for ServiceProvider split.

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: mojo/public/cpp/application/lib/service_connector.cc

Issue 337533002: Introduce internal::ServiceRegistry to prepare for ServiceProvider split. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge problems Created 6 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:

View side-by-side diff with in-line comments

Download patch

« mojo/public/cpp/application/lib/application.cc ('K') | « mojo/public/cpp/application/lib/service_connector.h ('k') | mojo/public/cpp/application/lib/service_registry.h » ('j') | mojo/public/cpp/application/lib/service_registry.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/cpp/application/lib/service_connector.cc

diff --git a/mojo/public/cpp/application/lib/service_connector.cc b/mojo/public/cpp/application/lib/service_connector.cc

index 3c53be011b900944a93884671365c60a83845532..5cc4421b7aaa9f4b930c86abc08d4377f3ae7e7d 100644

--- a/mojo/public/cpp/application/lib/service_connector.cc

+++ b/mojo/public/cpp/application/lib/service_connector.cc

@@ -7,16 +7,11 @@

namespace mojo {

namespace internal {

-ServiceConnectorBase::Owner::Owner() {}

-ServiceConnectorBase::Owner::Owner(

- ScopedMessagePipeHandle service_provider_handle) {

- service_provider_.Bind(service_provider_handle.Pass());

- service_provider_.set_client(this);

+ServiceConnectorBase::ServiceConnectorBase(const std::string& name)

+ : name_(name),

+ registry_(NULL) {

}

-ServiceConnectorBase::Owner::~Owner() {}

ServiceConnectorBase::~ServiceConnectorBase() {}

} // namespace internal