From 6179aceb5e2d0ed7646eb05f23be93f636c8e9f3 Mon Sep 17 00:00:00 2001 From: James Robinson Date: Wed, 14 Jan 2015 14:33:07 -0800 Subject: [PATCH] Pass ServiceProvider and ServiceProvider& params in Connect In preperation for removing the Client annotation from ServiceProvider this passes a second parameter of type ServiceProvider in the shell and application Connect calls. In this patch the type signatures are updated but the second parameter is basically unused. The intention is that the first parameter |services| will be used for the connecting application to request services from the connected application (as it does currently) and the second parameter |exported_services| be used for the connecting application to provide services to the connected application. We have very few services exported in the second direction today - I'll update them to use the second parameter in a follow-up patch. R=darin@chromium.org Review URL: https://codereview.chromium.org/845593003 --- engine/src/flutter/compositor/surface_holder.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/flutter/compositor/surface_holder.cc b/engine/src/flutter/compositor/surface_holder.cc index f2ad3297a0..e46490226e 100644 --- a/engine/src/flutter/compositor/surface_holder.cc +++ b/engine/src/flutter/compositor/surface_holder.cc @@ -20,7 +20,7 @@ SurfaceHolder::SurfaceHolder(Client* client, mojo::Shell* shell) : client_(client), id_namespace_(0u), local_id_(0u), weak_factory_(this) { mojo::ServiceProviderPtr service_provider; shell->ConnectToApplication("mojo:surfaces_service", - mojo::GetProxy(&service_provider)); + mojo::GetProxy(&service_provider), nullptr); mojo::ConnectToService(service_provider.get(), &surface_); surface_.set_client(this); }