mojo/services/public/cpp/view_manager/node.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/public/cpp/view_manager/node.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/cpp/view_manager/lib/view_manager_client_impl.cc ('K') | « mojo/services/public/cpp/view_manager/lib/view_manager_client_impl.cc ('k') | mojo/services/public/cpp/view_manager/tests/view_manager_unittest.cc » ('j') | mojo/services/public/cpp/view_manager/view_manager_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/public/cpp/view_manager/node.h

diff --git a/mojo/services/public/cpp/view_manager/node.h b/mojo/services/public/cpp/view_manager/node.h

index 3c3ca83cbda02cdbbfd913a105b8ade8f145425b..39ad516da314b9c7026cd2645fd619140b9ef650 100644

--- a/mojo/services/public/cpp/view_manager/node.h

+++ b/mojo/services/public/cpp/view_manager/node.h

@@ -10,12 +10,14 @@

#include "base/basictypes.h"

#include "base/observer_list.h"

#include "mojo/public/cpp/bindings/array.h"

+#include "mojo/public/interfaces/application/service_provider.mojom.h"

#include "mojo/services/public/cpp/view_manager/types.h"

#include "mojo/services/public/interfaces/view_manager/view_manager_constants.mojom.h"

#include "ui/gfx/geometry/rect.h"

namespace mojo {

+class ExportedServiceRegistry;

class View;

class ViewManager;

class NodeObserver;

@@ -73,6 +75,9 @@ class Node {

// Embedding.

void Embed(const String& url);

+ scoped_ptr<ServiceProvider> Embed(

+ const String& url,

+ scoped_ptr<ExportedServiceRegistry> exported_services);

protected:

// This class is subclassed only by test classes that provide a public ctor.