| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "content/browser/android/content_view_core_impl.h" | 5 #include "content/browser/android/content_view_core_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
| (...skipping 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1250 | 1250 |
| 1251 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter, | 1251 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter, |
| 1252 int text_input_type, | 1252 int text_input_type, |
| 1253 int text_input_flags, | 1253 int text_input_flags, |
| 1254 const std::string& text, | 1254 const std::string& text, |
| 1255 int selection_start, | 1255 int selection_start, |
| 1256 int selection_end, | 1256 int selection_end, |
| 1257 int composition_start, | 1257 int composition_start, |
| 1258 int composition_end, | 1258 int composition_end, |
| 1259 bool show_ime_if_needed, | 1259 bool show_ime_if_needed, |
| 1260 bool is_non_ime_change, | 1260 bool is_non_ime_change) { |
| 1261 bool in_batch_edit_mode) { | |
| 1262 JNIEnv* env = AttachCurrentThread(); | 1261 JNIEnv* env = AttachCurrentThread(); |
| 1263 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 1262 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
| 1264 if (obj.is_null()) | 1263 if (obj.is_null()) |
| 1265 return; | 1264 return; |
| 1266 | 1265 |
| 1267 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text); | 1266 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text); |
| 1268 Java_ContentViewCore_updateImeAdapter( | 1267 Java_ContentViewCore_updateImeAdapter( |
| 1269 env, obj, native_ime_adapter, text_input_type, text_input_flags, | 1268 env, obj, native_ime_adapter, text_input_type, text_input_flags, |
| 1270 jstring_text, selection_start, selection_end, composition_start, | 1269 jstring_text, selection_start, selection_end, composition_start, |
| 1271 composition_end, show_ime_if_needed, is_non_ime_change, | 1270 composition_end, show_ime_if_needed, is_non_ime_change); |
| 1272 in_batch_edit_mode); | |
| 1273 } | 1271 } |
| 1274 | 1272 |
| 1275 void ContentViewCoreImpl::SetAccessibilityEnabled( | 1273 void ContentViewCoreImpl::SetAccessibilityEnabled( |
| 1276 JNIEnv* env, | 1274 JNIEnv* env, |
| 1277 const JavaParamRef<jobject>& obj, | 1275 const JavaParamRef<jobject>& obj, |
| 1278 bool enabled) { | 1276 bool enabled) { |
| 1279 SetAccessibilityEnabledInternal(enabled); | 1277 SetAccessibilityEnabledInternal(enabled); |
| 1280 } | 1278 } |
| 1281 | 1279 |
| 1282 void ContentViewCoreImpl::SetTextTrackSettings( | 1280 void ContentViewCoreImpl::SetTextTrackSettings( |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1569 return ScopedJavaLocalRef<jobject>(); | 1567 return ScopedJavaLocalRef<jobject>(); |
| 1570 | 1568 |
| 1571 return view->GetJavaObject(); | 1569 return view->GetJavaObject(); |
| 1572 } | 1570 } |
| 1573 | 1571 |
| 1574 bool RegisterContentViewCore(JNIEnv* env) { | 1572 bool RegisterContentViewCore(JNIEnv* env) { |
| 1575 return RegisterNativesImpl(env); | 1573 return RegisterNativesImpl(env); |
| 1576 } | 1574 } |
| 1577 | 1575 |
| 1578 } // namespace content | 1576 } // namespace content |
| OLD | NEW |