mojo/services/html_viewer/html_viewer.cc - Issue 433513005: Pass ServiceProvider thru ViewManagerService::Embed() allowing embedder & embeddee to expose servic…

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/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, 5 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

« mojo/public/cpp/application/exported_service_registry.h ('K') | « mojo/public/cpp/application/lib/exported_service_registry.cc ('k') | mojo/services/public/cpp/view_manager/lib/node.cc » ('j') | mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 fb2512cc4265a109776ac3f3872d9c072739e94a..91eca564887f07c6750371834233d75c79e52346 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,

+ ExportedServiceRegistry* exported_services,

+ scoped_ptr<ServiceProvider> imported_services) OVERRIDE {

document_view_ = new HTMLDocumentView(

application_impl_->ConnectToApplication("mojo://mojo_window_manager/")->

GetServiceProvider(),