net/android/net_jni_registrar.cc - Issue 11571059: Add net/android/keystore.h

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: net/android/net_jni_registrar.cc

Issue 11571059: Add net/android/keystore.h (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: address marcus' nits. Created 7 years, 10 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:

Index: net/android/net_jni_registrar.cc

diff --git a/net/android/net_jni_registrar.cc b/net/android/net_jni_registrar.cc

index cfc3bb14ed960aec36d5bf3eb5e4a97cfee48407..a6e09b65080b89dddba026a745cd17c490e0422e 100644

--- a/net/android/net_jni_registrar.cc

+++ b/net/android/net_jni_registrar.cc

@@ -8,6 +8,7 @@

#include "base/android/jni_android.h"

#include "base/android/jni_registrar.h"

#include "net/android/gurl_utils.h"

+#include "net/android/keystore.h"

#include "net/android/network_change_notifier_android.h"

#include "net/android/network_library.h"

#include "net/proxy/proxy_config_service_android.h"

@@ -16,6 +17,7 @@ namespace net {

namespace android {

static base::android::RegistrationMethod kNetRegisteredMethods[] = {

+ { "AndroidKeyStore", net::android::RegisterKeyStore },

{ "AndroidNetworkLibrary", net::android::RegisterNetworkLibrary },

{ "GURLUtils", net::RegisterGURLUtils },

{ "NetworkChangeNotifierAndroid",

« no previous file with comments | « net/android/keystore_unittest.cc ('k') | net/android/private_key_type_list.h » ('j') | no next file with comments »