chrome/browser/ui/android/navigation_popup.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/navigation_popup.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/javascript_app_modal_dialog_android.cc ('k') | chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3ddf087bec212c2db5b04ad57eb3c1ade2bd551c..53129a227e54f5d79cf8685fd85a95ac26cb5769 100644

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

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

@@ -80,8 +80,8 @@

gfx::ConvertToJavaBitmap(image.ToSkBitmap()).obj());

}

-static ScopedJavaLocalRef<jstring> GetHistoryUrl(JNIEnv* env, jclass clazz) {

- return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL);

+static jstring GetHistoryUrl(JNIEnv* env, jclass clazz) {

+ return ConvertUTF8ToJavaString(env, chrome::kChromeUIHistoryURL).Release();

}

static jlong Init(JNIEnv* env, jobject obj) {