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

Unified Diff: mojo/services/html_viewer/html_viewer.cc

Issue 433513005: Pass ServiceProvider thru ViewManagerService::Embed() allowing embedder & embeddee to expose servic… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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: mojo/services/html_viewer/html_viewer.cc
diff --git a/mojo/services/html_viewer/html_viewer.cc b/mojo/services/html_viewer/html_viewer.cc
index 0a018bb2f04b2a7b17ae1006fa356ffc9794ea17..9ab3b893ab634f11e7e20f207e0bf7597fba9ef1 100644
--- a/mojo/services/html_viewer/html_viewer.cc
+++ b/mojo/services/html_viewer/html_viewer.cc
@@ -72,7 +72,10 @@ class HTMLViewer : public ApplicationDelegate, public ViewManagerDelegate {
}
// Overridden from ViewManagerDelegate:
- virtual void OnEmbed(ViewManager* view_manager, Node* root) OVERRIDE {
+ virtual void OnEmbed(ViewManager* view_manager,
+ Node* root,
+ ServiceProviderImpl* exported_services,
+ scoped_ptr<ServiceProvider> imported_services) OVERRIDE {
document_view_ = new HTMLDocumentView(
application_impl_->ConnectToApplication("mojo://mojo_window_manager/")->
GetServiceProvider(),
« no previous file with comments | « mojo/public/cpp/application/service_provider_impl.h ('k') | mojo/services/public/cpp/view_manager/lib/node.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698