mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc - Issue 905083002: Adds Embed() variant to ViewManagerService that takes ViewManagerClient

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc

Issue 905083002: Adds Embed() variant to ViewManagerService that takes ViewManagerClient (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: EmbedUrl Created 5 years, 10 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 | « mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h ('k') | mojo/services/view_manager/public/cpp/view.h » ('j') | services/view_manager/view_manager_service_apptest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc

diff --git a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc b/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc

index 3fffac256b2aedc56440dff1a2dd833fbbc7ee33..574d3001807504c046be29460d1606e2a185c650 100644

--- a/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc

+++ b/mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.cc

@@ -204,8 +204,13 @@ void ViewManagerClientImpl::Embed(const String& url,

InterfaceRequest<ServiceProvider> services,

ServiceProviderPtr exposed_services) {

DCHECK(service_);

- service_->Embed(url, view_id, services.Pass(), exposed_services.Pass(),

- ActionCompletedCallback());

+ service_->EmbedUrl(url, view_id, services.Pass(), exposed_services.Pass(),

+ ActionCompletedCallback());

+void ViewManagerClientImpl::Embed(Id view_id, ViewManagerClientPtr client) {

+ DCHECK(service_);

+ service_->Embed(view_id, client.Pass(), ActionCompletedCallback());

}

void ViewManagerClientImpl::AddView(View* view) {