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

Unified Diff: sky/viewer/document_view.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/document_view.h ('k') | sky/viewer/internals.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/viewer/document_view.cc
diff --git a/sky/viewer/document_view.cc b/sky/viewer/document_view.cc
index 83011748a556922fe88576742704660ae8dc51ea..2344712c26a14c9e9ab38032288af477ea3938b1 100644
--- a/sky/viewer/document_view.cc
+++ b/sky/viewer/document_view.cc
@@ -73,7 +73,8 @@ mojo::Target WebNavigationPolicyToNavigationTarget(
static int s_next_debugger_id = 1;
DocumentView::DocumentView(
- mojo::ServiceProviderPtr provider,
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exported_services,
mojo::URLResponsePtr response,
mojo::Shell* shell)
: response_(response.Pass()),
@@ -84,8 +85,9 @@ DocumentView::DocumentView(
inspector_service_factory_(this),
weak_factory_(this),
debugger_id_(s_next_debugger_id++) {
+ // TODO(jamesr): Is this right?
exported_services_.AddService(&view_manager_client_factory_);
- mojo::WeakBindToPipe(&exported_services_, provider.PassMessagePipe());
+ mojo::WeakBindToPipe(&exported_services_, services.PassMessagePipe());
}
DocumentView::~DocumentView() {
« no previous file with comments | « sky/viewer/document_view.h ('k') | sky/viewer/internals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698