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

Unified Diff: sky/engine/v8_inspector/inspector_backend_mojo.cc

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: rebase for trybots (no code changes from ps2) 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
« no previous file with comments | « shell/application_manager/application_manager.cc ('k') | sky/services/inspector/server.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/engine/v8_inspector/inspector_backend_mojo.cc
diff --git a/sky/engine/v8_inspector/inspector_backend_mojo.cc b/sky/engine/v8_inspector/inspector_backend_mojo.cc
index c4349efdead1e40e9653a1ad908980b30f903c96..decf67018bd5788eaf0aeab5c2f83ec623dc793a 100644
--- a/sky/engine/v8_inspector/inspector_backend_mojo.cc
+++ b/sky/engine/v8_inspector/inspector_backend_mojo.cc
@@ -106,13 +106,13 @@ InspectorBackendMojoImpl::~InspectorBackendMojoImpl() {
void InspectorBackendMojoImpl::Connect() {
mojo::Shell* shell = host_->GetShell();
- mojo::InterfaceRequest<mojo::ServiceProvider> service_provider_request;
- mojo::MessagePipe pipe;
- service_provider_request.Bind(pipe.handle0.Pass());
- inspector_service_provider_.BindToHandle(pipe.handle1.Pass());
- shell->ConnectToApplication("mojo:sky_inspector_server",
- service_provider_request.Pass(), nullptr);
- mojo::ConnectToService(&inspector_service_provider_, &frontend_);
+
+ mojo::ServiceProviderPtr services;
+ mojo::ServiceProviderPtr exposed_services;
+ inspector_service_provider_.Bind(GetProxy(&exposed_services));
+ shell->ConnectToApplication("mojo:sky_inspector_server", GetProxy(&services),
+ exposed_services.Pass());
+ mojo::ConnectToService(services.get(), &frontend_);
// Theoretically we should load our state from the inspector cookie.
inspector_state_ =
« no previous file with comments | « shell/application_manager/application_manager.cc ('k') | sky/services/inspector/server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698