chrome/browser/ui/android/connection_info_popup_android.cc - Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

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: chrome/browser/ui/android/connection_info_popup_android.cc

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 4 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 | « chrome/browser/ui/android/certificate_viewer_android.cc ('k') | chrome/browser/ui/android/javascript_app_modal_dialog_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/connection_info_popup_android.cc

diff --git a/chrome/browser/ui/android/connection_info_popup_android.cc b/chrome/browser/ui/android/connection_info_popup_android.cc

index 4be9e37327610745ab82de0cc4bf0fcf702017b6..3b7878e56249ce09685238752ce68b0bd68cce36 100644

--- a/chrome/browser/ui/android/connection_info_popup_android.cc

+++ b/chrome/browser/ui/android/connection_info_popup_android.cc

@@ -30,12 +30,13 @@

using content::CertStore;

using content::WebContents;

-static ScopedJavaLocalRef<jobjectArray>

-GetCertificateChain(JNIEnv* env, jobject obj, jobject java_web_contents) {

+static jobjectArray GetCertificateChain(JNIEnv* env,

+ jobject obj,

+ jobject java_web_contents) {

content::WebContents* web_contents =

content::WebContents::FromJavaWebContents(java_web_contents);

if (!web_contents)

- return ScopedJavaLocalRef<jobjectArray>();

+ return NULL;

int cert_id =

web_contents->GetController().GetVisibleEntry()->GetSSL().cert_id;

@@ -61,7 +62,8 @@

cert_chain.push_back(cert_bytes);

}

- return base::android::ToJavaArrayOfByteArray(env, cert_chain);

+ // OK to release, JNI binding.

+ return base::android::ToJavaArrayOfByteArray(env, cert_chain).Release();

}

// static