| OLD | NEW |
| 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 jstring SanitizeTextForPaste(JNIEnv* env, jclass clazz, jstring jtext) { | 12 ScopedJavaLocalRef<jstring> SanitizeTextForPaste(JNIEnv* env, |
| 13 jclass clazz, |
| 14 jstring jtext) { |
| 13 base::string16 pasted_text( | 15 base::string16 pasted_text( |
| 14 base::android::ConvertJavaStringToUTF16(env, jtext)); | 16 base::android::ConvertJavaStringToUTF16(env, jtext)); |
| 15 pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text); | 17 pasted_text = OmniboxView::SanitizeTextForPaste(pasted_text); |
| 16 return base::android::ConvertUTF16ToJavaString(env, pasted_text).Release(); | 18 return base::android::ConvertUTF16ToJavaString(env, pasted_text); |
| 17 } | 19 } |
| 18 | 20 |
| 19 // static | 21 // static |
| 20 bool OmniboxViewUtil::RegisterOmniboxViewUtil(JNIEnv* env) { | 22 bool OmniboxViewUtil::RegisterOmniboxViewUtil(JNIEnv* env) { |
| 21 return RegisterNativesImpl(env); | 23 return RegisterNativesImpl(env); |
| 22 } | 24 } |
| OLD | NEW |