Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1277)

Unified Diff: mojo/public/cpp/application/lib/service_provider_impl.cc

Issue 489493004: Update view manager to support content handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: blah to the blizzah Created 6 years, 4 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
Index: mojo/public/cpp/application/lib/service_provider_impl.cc
diff --git a/mojo/public/cpp/application/lib/service_provider_impl.cc b/mojo/public/cpp/application/lib/service_provider_impl.cc
index 1edebd25532529411866b2a1537080110c3402ad..866e28638f85bc22f5227507d4a9dc89e3199304 100644
--- a/mojo/public/cpp/application/lib/service_provider_impl.cc
+++ b/mojo/public/cpp/application/lib/service_provider_impl.cc
@@ -10,7 +10,13 @@
namespace mojo {
-ServiceProviderImpl::ServiceProviderImpl() : remote_(NULL) {
+ServiceProviderImpl::ServiceProviderImpl()
+ : application_connection_(NULL), remote_(NULL) {
+}
+
+ServiceProviderImpl::ServiceProviderImpl(
+ ApplicationConnection* application_connection)
+ : application_connection_(application_connection), remote_(NULL) {
}
ServiceProviderImpl::~ServiceProviderImpl() {
@@ -45,8 +51,7 @@ void ServiceProviderImpl::AddServiceConnector(
internal::ServiceConnectorBase* service_connector) {
RemoveServiceConnector(service_connector);
service_connectors_[service_connector->name()] = service_connector;
- // TODO(beng): perhaps take app connection thru ctor??
- service_connector->set_application_connection(NULL);
+ service_connector->set_application_connection(application_connection_);
}
void ServiceProviderImpl::RemoveServiceConnector(
« no previous file with comments | « mojo/public/cpp/application/interface_factory_impl.h ('k') | mojo/public/cpp/application/service_provider_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698