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

Unified Diff: sky/viewer/internals.cc

Issue 845593003: Pass ServiceProvider and ServiceProvider& params in Connect (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: use nullptr instead of ServiceProviderPtr(), fix ShellImpl 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 | « sky/viewer/internals.h ('k') | sky/viewer/services/inspector_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/viewer/internals.cc
diff --git a/sky/viewer/internals.cc b/sky/viewer/internals.cc
index f52e7ed1ed6fb7b45e4bb93a496904b39302f674..5edf79affc691598f4274f8550c0ada50d0d28a1 100644
--- a/sky/viewer/internals.cc
+++ b/sky/viewer/internals.cc
@@ -100,11 +100,13 @@ mojo::Handle Internals::PassShellProxyHandle() {
}
void Internals::ConnectToApplication(
- const mojo::String& application_url,
- mojo::InterfaceRequest<mojo::ServiceProvider> provider) {
- if (document_view_)
+ const mojo::String& application_url,
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services) {
+ if (document_view_) {
document_view_->shell()->ConnectToApplication(
- application_url, provider.Pass());
+ application_url, services.Pass(), exposed_services.Pass());
+ }
}
mojo::Handle Internals::ConnectToService(
@@ -113,7 +115,8 @@ mojo::Handle Internals::ConnectToService(
return mojo::Handle();
mojo::ServiceProviderPtr service_provider;
- ConnectToApplication(application_url, mojo::GetProxy(&service_provider));
+ ConnectToApplication(application_url, mojo::GetProxy(&service_provider),
+ nullptr);
mojo::MessagePipe pipe;
service_provider->ConnectToService(interface_name, pipe.handle1.Pass());
« no previous file with comments | « sky/viewer/internals.h ('k') | sky/viewer/services/inspector_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698