| Index: chrome/browser/ui/android/certificate_viewer_android.cc
|
| diff --git a/chrome/browser/ui/android/certificate_viewer_android.cc b/chrome/browser/ui/android/certificate_viewer_android.cc
|
| index f4a1380441a94749e939b6a5123e1e43e50662b5..fa2277016e4ae97c66e885f5b9ab171d0576375f 100644
|
| --- a/chrome/browser/ui/android/certificate_viewer_android.cc
|
| +++ b/chrome/browser/ui/android/certificate_viewer_android.cc
|
| @@ -21,69 +21,86 @@ void ShowCertificateViewer(content::WebContents* web_contents,
|
| NOTREACHED();
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertIssuedToText(JNIEnv* env, jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertIssuedToText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_SUBJECT_GROUP));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertInfoCommonNameText(JNIEnv* env,
|
| - jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertInfoCommonNameText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_COMMON_NAME_LABEL));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertInfoOrganizationText(JNIEnv* env,
|
| - jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertInfoOrganizationText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_ORGANIZATION_LABEL));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertInfoSerialNumberText(JNIEnv* env,
|
| - jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertInfoSerialNumberText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_SERIAL_NUMBER_LABEL));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertInfoOrganizationUnitText(JNIEnv* env,
|
| - jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertInfoOrganizationUnitText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_ORGANIZATIONAL_UNIT_LABEL));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertIssuedByText(JNIEnv* env, jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertIssuedByText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_ISSUER_GROUP));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertValidityText(JNIEnv* env, jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertValidityText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_VALIDITY_GROUP));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertIssuedOnText(JNIEnv* env, jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertIssuedOnText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_ISSUED_ON_LABEL));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertExpiresOnText(JNIEnv* env, jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertExpiresOnText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_EXPIRES_ON_LABEL));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertFingerprintsText(JNIEnv* env,
|
| - jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertFingerprintsText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_FINGERPRINTS_GROUP));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertSHA256FingerprintText(JNIEnv* env,
|
| - jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertSHA256FingerprintText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA256_FINGERPRINT_LABEL));
|
| }
|
|
|
| -static ScopedJavaLocalRef<jstring> GetCertSHA1FingerprintText(JNIEnv* env,
|
| - jclass) {
|
| +static ScopedJavaLocalRef<jstring> GetCertSHA1FingerprintText(
|
| + JNIEnv* env,
|
| + const JavaParamRef<jclass>&) {
|
| return ConvertUTF8ToJavaString(
|
| env, l10n_util::GetStringUTF8(IDS_CERT_INFO_SHA1_FINGERPRINT_LABEL));
|
| }
|
|
|