mojo/services/window_manager/window_manager_app.h - 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/window_manager/window_manager_app.h

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/services/public/interfaces/view_manager/view_manager.mojom ('K') | « mojo/services/window_manager/window_manager_api_unittest.cc ('k') | mojo/services/window_manager/window_manager_app.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/window_manager/window_manager_app.h

diff --git a/mojo/services/window_manager/window_manager_app.h b/mojo/services/window_manager/window_manager_app.h

index 4621e90af2785bfc34961c6d2f57e0113edb6631..1c79b233ed6f92aaa1b955d58332321d17a97e43 100644

--- a/mojo/services/window_manager/window_manager_app.h

+++ b/mojo/services/window_manager/window_manager_app.h

@@ -70,13 +70,18 @@ class WindowManagerApp

typedef std::map<Id, aura::Window*> NodeIdToWindowMap;

// Overridden from ViewManagerDelegate:

- virtual void OnEmbed(ViewManager* view_manager, Node* root) MOJO_OVERRIDE;

+ virtual void OnEmbed(

+ ViewManager* view_manager,

+ Node* root,

+ ExportedServiceRegistry* exported_services,

+ scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE;

virtual void OnViewManagerDisconnected(

ViewManager* view_manager) MOJO_OVERRIDE;

// Overridden from NodeObserver:

virtual void OnTreeChanged(

const NodeObserver::TreeChangeParams& params) MOJO_OVERRIDE;

+ virtual void OnNodeDestroyed(Node* node) MOJO_OVERRIDE;

// Overridden from WindowTreeHostMojoDelegate:

virtual void CompositorContentsChanged(const SkBitmap& bitmap) MOJO_OVERRIDE;