content/public/common/service_registry.h - Issue 302573002: Add a Javascript wrapper around ServiceRegistry and expose it to WebUI.

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: content/public/common/service_registry.h

Issue 302573002: Add a Javascript wrapper around ServiceRegistry and expose it to WebUI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@render-view-shell

Patch Set: Created 6 years, 6 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

« content/browser/webui/web_ui_mojo_browsertest.cc ('K') | « content/content_renderer.gypi ('k') | content/public/renderer/service_registry_js.h » ('j') | content/renderer/service_registry_js_wrapper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/common/service_registry.h

diff --git a/content/public/common/service_registry.h b/content/public/common/service_registry.h

index bbad59efad8e0266b1857f86181bf335431b5a77..3de2955905eca396fb2e035db146db7114cd2c2e 100644

--- a/content/public/common/service_registry.h

+++ b/content/public/common/service_registry.h

@@ -9,6 +9,7 @@

#include "base/bind.h"

#include "base/callback.h"

+#include "base/memory/weak_ptr.h"

#include "base/strings/string_piece.h"

#include "content/common/content_export.h"

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

@@ -20,7 +21,8 @@ namespace content {

// A ServiceRegistry exposes local services that have been added using

// AddService to a paired remote ServiceRegistry and provides local access to

// services exposed by the remote ServiceRegistry through GetInterface.

-class CONTENT_EXPORT ServiceRegistry {

+class CONTENT_EXPORT ServiceRegistry

+ : public base::SupportsWeakPtr<ServiceRegistry> {

darin (slow to review) 2014/06/21 04:44:16 Please use WeakPtrFactory instead. There was a chr

Sam McNally 2014/06/24 08:45:01 Done.

public:

virtual ~ServiceRegistry() {}