content/public/common/service_registry.h - Issue 1831173002: Scaffolding for Android implementation of PaymentRequest.

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 1831173002: Scaffolding for Android implementation of PaymentRequest. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo

Patch Set: Register PaymentRequest with render process Created 4 years, 9 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/common/mojo/service_registry_impl.cc ('K') | « content/public/android/java/src/org/chromium/content/browser/ServiceRegistry.java ('k') | content/shell/browser/shell_mojo_test_utils_android.cc » ('j') | no next file with comments »
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 41edc199ce7a78992a03e9e732b8f0e452a811f5..2ce24c5eb6f8e95d0167846a5c9fd3f535de3041 100644

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

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

@@ -16,6 +16,11 @@

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

#include "mojo/public/cpp/system/core.h"

+#if defined(OS_ANDROID)

+#include <jni.h>

+#include "base/android/scoped_java_ref.h"

+#endif

namespace content {

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

@@ -72,6 +77,11 @@ class CONTENT_EXPORT ServiceRegistry {

// by AddServiceOverrideForTesting. Used only for testing.

virtual void ClearServiceOverridesForTesting() = 0;

+#if defined(OS_ANDROID)

+ // Returns the corresponding Java object.

+ virtual const base::android::ScopedJavaGlobalRef<jobject>& GetJavaObj() = 0;

+#endif

private:

template <typename Interface>

static void ForwardToServiceFactory(