mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h - 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: mojo/services/view_manager/public/cpp/lib/view_manager_client_impl.h

Issue 858103002: Remove [Client=] annotation from ServiceProvider (Closed) Base URL: git@github.com:domokit/mojo.git@master

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

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

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

index 01812cb29c5305e89f48bd2572b9625679c4527e..a159842484528593cb28a878eced2b0e2a365b49 100644

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

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

@@ -63,7 +63,8 @@ class ViewManagerClientImpl : public ViewManager,

void Embed(const String& url, Id view_id);

void Embed(const String& url,

Id view_id,

- InterfaceRequest<ServiceProvider> service_provider);

+ InterfaceRequest<ServiceProvider> parent_services,

+ ServiceProviderPtr parent_exposed_services);

void set_change_acked_callback(const base::Callback<void(void)>& callback) {

change_acked_callback_ = callback;

@@ -96,6 +97,7 @@ class ViewManagerClientImpl : public ViewManager,

const String& creator_url,

ViewDataPtr root,

InterfaceRequest<ServiceProvider> parent_services,

+ ServiceProviderPtr parent_exposed_services,

ScopedMessagePipeHandle window_manager_pipe) override;

void OnEmbeddedAppDisconnected(Id view_id) override;

void OnViewBoundsChanged(Id view_id,