Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1257)

Unified Diff: net/android/keystore.h

Issue 599493004: Use the new java_cpp_enum rule in net. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: one more aosp fix Created 6 years, 3 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
« no previous file with comments | « net/android/java/src/org/chromium/net/X509Util.java ('k') | net/android/private_key_type_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/keystore.h
diff --git a/net/android/keystore.h b/net/android/keystore.h
index a02d6608be85ef318282b6ebf1846086a29cf1db..827422910ea40b8f1c2cbd0b32f636a1fd156742 100644
--- a/net/android/keystore.h
+++ b/net/android/keystore.h
@@ -26,10 +26,14 @@ struct AndroidEVP_PKEY;
// Define a list of constants describing private key types. The
// values are shared with Java through org.chromium.net.PrivateKeyType.
// Example: PRIVATE_KEY_TYPE_RSA.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
enum PrivateKeyType {
-#define DEFINE_PRIVATE_KEY_TYPE(name,value) PRIVATE_KEY_TYPE_ ## name = value,
-#include "net/android/private_key_type_list.h"
-#undef DEFINE_PRIVATE_KEY_TYPE
+ PRIVATE_KEY_TYPE_RSA = 0,
+ PRIVATE_KEY_TYPE_DSA = 1,
+ PRIVATE_KEY_TYPE_ECDSA = 2,
+ PRIVATE_KEY_TYPE_INVALID = 255,
};
// Returns the modulus of a given RSAPrivateKey platform object,
« no previous file with comments | « net/android/java/src/org/chromium/net/X509Util.java ('k') | net/android/private_key_type_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698