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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 791493006: De-client tracing.TraceController interface (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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/common/tracing_impl.cc ('K') | « mojo/common/tracing_impl.cc ('k') | services/fake_surfaces/fake_surfaces_service_application.h » ('j') | shell/context.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/cpp/application/lib/service_registry.cc
diff --git a/mojo/public/cpp/application/lib/service_registry.cc b/mojo/public/cpp/application/lib/service_registry.cc
index d934a166ba3c020372bf8dcd243dc1b214bfd4e9..01c6c70e9a8808c73cbca638dc28a595c3d5c845 100644
--- a/mojo/public/cpp/application/lib/service_registry.cc
+++ b/mojo/public/cpp/application/lib/service_registry.cc
@@ -18,8 +18,10 @@ ServiceRegistry::ServiceRegistry(
InterfaceRequest<ServiceProvider> local_services)
: application_impl_(application_impl),
url_(url),
- local_binding_(this, local_services.Pass()),
+ local_binding_(this),
remote_service_provider_(remote_services.Pass()) {
+ if (local_services.is_pending())
+ local_binding_.Bind(local_services.Pass());
}
ServiceRegistry::ServiceRegistry()
« mojo/common/tracing_impl.cc ('K') | « mojo/common/tracing_impl.cc ('k') | services/fake_surfaces/fake_surfaces_service_application.h » ('j') | shell/context.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698