services/window_manager/window_manager_impl.cc - Issue 858103002: Remove [Client=] annotation from ServiceProvider

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: services/window_manager/window_manager_impl.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:

Index: services/window_manager/window_manager_impl.cc

diff --git a/services/window_manager/window_manager_impl.cc b/services/window_manager/window_manager_impl.cc

index 1cba820ba83572a05d299fbc49d6c537bcb0df5e..8c42aa64d5f1ac2e4b010bfdad5d18f23d82ba52 100644

--- a/services/window_manager/window_manager_impl.cc

+++ b/services/window_manager/window_manager_impl.cc

@@ -49,8 +49,9 @@ void WindowManagerImpl::NotifyCaptureChanged(Id new_capture_id,

void WindowManagerImpl::Embed(

const mojo::String& url,

- mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) {

- window_manager_->Embed(url, service_provider.Pass());

+ mojo::InterfaceRequest<mojo::ServiceProvider> services,

+ mojo::ServiceProviderPtr exposed_services) {

+ window_manager_->Embed(url, services.Pass(), exposed_services.Pass());

}

void WindowManagerImpl::SetCapture(Id view,