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

Unified Diff: net/base/mime_util.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/private_key_type_list.h ('k') | net/base/mime_util_certificate_type_list.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/mime_util.h
diff --git a/net/base/mime_util.h b/net/base/mime_util.h
index 3275464676460737ff5a0a48b09b148ed76a7a35..24dca3def6e928d98d46b1b3a1d15c8a450fe0c4 100644
--- a/net/base/mime_util.h
+++ b/net/base/mime_util.h
@@ -147,10 +147,14 @@ NET_EXPORT void RemoveProprietaryMediaTypesAndCodecsForTests();
NET_EXPORT const std::string GetIANAMediaType(const std::string& mime_type);
// A list of supported certificate-related mime types.
+//
+// A Java counterpart will be generated for this enum.
+// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
enum CertificateMimeType {
-#define CERTIFICATE_MIME_TYPE(name, value) CERTIFICATE_MIME_TYPE_ ## name = value,
-#include "net/base/mime_util_certificate_type_list.h"
-#undef CERTIFICATE_MIME_TYPE
+ CERTIFICATE_MIME_TYPE_UNKNOWN,
+ CERTIFICATE_MIME_TYPE_X509_USER_CERT,
+ CERTIFICATE_MIME_TYPE_X509_CA_CERT,
+ CERTIFICATE_MIME_TYPE_PKCS12_ARCHIVE,
};
NET_EXPORT CertificateMimeType GetCertificateMimeTypeForMimeType(
« no previous file with comments | « net/android/private_key_type_list.h ('k') | net/base/mime_util_certificate_type_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698