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