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

Index: chrome/browser/ui/android/omnibox/omnibox_view_util.cc

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

index 5a19a5b12cafddaab5e3caa1cb562c60f6894fd9..d389fb53f337166dbd21bf63e22e384c57b1f90a 100644

--- a/chrome/browser/ui/android/omnibox/omnibox_view_util.cc

+++ b/chrome/browser/ui/android/omnibox/omnibox_view_util.cc

@@ -9,13 +9,11 @@

#include "jni/OmniboxViewUtil_jni.h"

// static

-ScopedJavaLocalRef<jstring> SanitizeTextForPaste(JNIEnv* env,

- jclass clazz,

- jstring jtext) {

+jstring SanitizeTextForPaste(JNIEnv* env, jclass clazz, jstring jtext) {

base::string16 pasted_text(

base::android::ConvertJavaStringToUTF16(env, jtext));

pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text);

- return base::android::ConvertUTF16ToJavaString(env, pasted_text);

+ return base::android::ConvertUTF16ToJavaString(env, pasted_text).Release();

}

// static

« no previous file with comments | « chrome/browser/ui/android/omnibox/omnibox_url_emphasizer.cc ('k') | components/cronet/android/chromium_url_request.cc » ('j') | no next file with comments »