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

Unified Diff: services/window_manager/window_manager_app.h

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:
View side-by-side diff with in-line comments
Download patch
Index: services/window_manager/window_manager_app.h
diff --git a/services/window_manager/window_manager_app.h b/services/window_manager/window_manager_app.h
index 1209f6fb60c0e02c8a77bb3c563470f2b51c13c2..3d6110699ad413c8642e0da8eb6644105cbb7831 100644
--- a/services/window_manager/window_manager_app.h
+++ b/services/window_manager/window_manager_app.h
@@ -91,7 +91,8 @@ class WindowManagerApp
// then forwards to delegate, otherwise waits for connection to establish then
// forwards.
void Embed(const mojo::String& url,
- mojo::InterfaceRequest<mojo::ServiceProvider> service_provider);
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services);
// Overridden from ApplicationDelegate:
void Initialize(mojo::ApplicationImpl* impl) override;
@@ -125,8 +126,8 @@ class WindowManagerApp
// Overridden from ViewManagerDelegate:
void OnEmbed(mojo::View* root,
- mojo::ServiceProviderImpl* exported_services,
- scoped_ptr<mojo::ServiceProvider> imported_services) override;
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services) override;
void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
// Overridden from ViewObserver:
« no previous file with comments | « services/window_manager/window_manager_api_unittest.cc ('k') | services/window_manager/window_manager_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698