| 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 1264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1275 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter, | 1275 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter, |
| 1276 int text_input_type, | 1276 int text_input_type, |
| 1277 int text_input_flags, | 1277 int text_input_flags, |
| 1278 int text_input_mode, | 1278 int text_input_mode, |
| 1279 const std::string& text, | 1279 const std::string& text, |
| 1280 int selection_start, | 1280 int selection_start, |
| 1281 int selection_end, | 1281 int selection_end, |
| 1282 int composition_start, | 1282 int composition_start, |
| 1283 int composition_end, | 1283 int composition_end, |
| 1284 bool show_ime_if_needed, | 1284 bool show_ime_if_needed, |
| 1285 bool is_non_ime_change) { | 1285 bool reply_to_request) { |
| 1286 JNIEnv* env = AttachCurrentThread(); | 1286 JNIEnv* env = AttachCurrentThread(); |
| 1287 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 1287 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
| 1288 if (obj.is_null()) | 1288 if (obj.is_null()) |
| 1289 return; | 1289 return; |
| 1290 | 1290 |
| 1291 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text); | 1291 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text); |
| 1292 Java_ContentViewCore_updateImeAdapter( | 1292 Java_ContentViewCore_updateImeAdapter( |
| 1293 env, obj, native_ime_adapter, text_input_type, text_input_flags, | 1293 env, obj, native_ime_adapter, text_input_type, text_input_flags, |
| 1294 text_input_mode, jstring_text, selection_start, selection_end, | 1294 text_input_mode, jstring_text, selection_start, selection_end, |
| 1295 composition_start, composition_end, show_ime_if_needed, | 1295 composition_start, composition_end, show_ime_if_needed, reply_to_request); |
| 1296 is_non_ime_change); | |
| 1297 } | 1296 } |
| 1298 | 1297 |
| 1299 void ContentViewCoreImpl::SetAccessibilityEnabled( | 1298 void ContentViewCoreImpl::SetAccessibilityEnabled( |
| 1300 JNIEnv* env, | 1299 JNIEnv* env, |
| 1301 const JavaParamRef<jobject>& obj, | 1300 const JavaParamRef<jobject>& obj, |
| 1302 bool enabled) { | 1301 bool enabled) { |
| 1303 SetAccessibilityEnabledInternal(enabled); | 1302 SetAccessibilityEnabledInternal(enabled); |
| 1304 } | 1303 } |
| 1305 | 1304 |
| 1306 void ContentViewCoreImpl::SetTextTrackSettings( | 1305 void ContentViewCoreImpl::SetTextTrackSettings( |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1567 return ScopedJavaLocalRef<jobject>(); | 1566 return ScopedJavaLocalRef<jobject>(); |
| 1568 | 1567 |
| 1569 return view->GetJavaObject(); | 1568 return view->GetJavaObject(); |
| 1570 } | 1569 } |
| 1571 | 1570 |
| 1572 bool RegisterContentViewCore(JNIEnv* env) { | 1571 bool RegisterContentViewCore(JNIEnv* env) { |
| 1573 return RegisterNativesImpl(env); | 1572 return RegisterNativesImpl(env); |
| 1574 } | 1573 } |
| 1575 | 1574 |
| 1576 } // namespace content | 1575 } // namespace content |
| OLD | NEW |