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

Side by Side 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, 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h" 5 #include "chrome/browser/ui/android/omnibox/omnibox_view_util.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "components/omnibox/browser/omnibox_view.h" 8 #include "components/omnibox/browser/omnibox_view.h"
9 #include "jni/OmniboxViewUtil_jni.h" 9 #include "jni/OmniboxViewUtil_jni.h"
10 10
11 // static 11 // static
12 ScopedJavaLocalRef<jstring> SanitizeTextForPaste(JNIEnv* env, 12 jstring SanitizeTextForPaste(JNIEnv* env, jclass clazz, jstring jtext) {
13 jclass clazz,
14 jstring jtext) {
15 base::string16 pasted_text( 13 base::string16 pasted_text(
16 base::android::ConvertJavaStringToUTF16(env, jtext)); 14 base::android::ConvertJavaStringToUTF16(env, jtext));
17 pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text); 15 pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text);
18 return base::android::ConvertUTF16ToJavaString(env, pasted_text); 16 return base::android::ConvertUTF16ToJavaString(env, pasted_text).Release();
19 } 17 }
20 18
21 // static 19 // static
22 bool OmniboxViewUtil::RegisterOmniboxViewUtil(JNIEnv* env) { 20 bool OmniboxViewUtil::RegisterOmniboxViewUtil(JNIEnv* env) {
23 return RegisterNativesImpl(env); 21 return RegisterNativesImpl(env);
24 } 22 }
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698