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

Unified Diff: sky/tools/debugger/debugger.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
« no previous file with comments | « sky/services/inspector/server.cc ('k') | sky/tools/debugger/debugger.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/debugger/debugger.h
diff --git a/sky/tools/debugger/debugger.h b/sky/tools/debugger/debugger.h
index 9aa5b2faf6768277aa8042ff4fb2be3e7ff6d827..d7412a257e94bed6de64a84aa0ae77a0dda76063 100644
--- a/sky/tools/debugger/debugger.h
+++ b/sky/tools/debugger/debugger.h
@@ -48,8 +48,8 @@ class SkyDebugger : public mojo::ApplicationDelegate,
// Overridden from mojo::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;
// Overriden from mojo::ViewObserver:
@@ -63,9 +63,9 @@ class SkyDebugger : public mojo::ApplicationDelegate,
mojo::InterfaceRequest<Debugger> request) override;
// Overridden from WindowManagerDelegate
- void Embed(
- const mojo::String& url,
- mojo::InterfaceRequest<mojo::ServiceProvider> service_provider) override;
+ void Embed(const mojo::String& url,
+ mojo::InterfaceRequest<mojo::ServiceProvider> services,
+ mojo::ServiceProviderPtr exposed_services) override;
scoped_ptr<window_manager::WindowManagerApp> window_manager_app_;
@@ -73,9 +73,10 @@ class SkyDebugger : public mojo::ApplicationDelegate,
mojo::View* content_;
std::string pending_url_;
- scoped_ptr<mojo::ServiceProvider> viewer_services_;
+ mojo::ServiceProviderPtr viewer_services_;
NavigatorHostFactory navigator_host_factory_;
+ mojo::ServiceProviderImpl exposed_services_impl_;
base::WeakPtrFactory<SkyDebugger> weak_factory_;
« no previous file with comments | « sky/services/inspector/server.cc ('k') | sky/tools/debugger/debugger.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698