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

Side by Side Diff: content/browser/android/content_view_core_impl.cc

Issue 2596193002: Clean up names and remove unnecessary parameter (Closed)
Patch Set: rebase Created 3 years, 11 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 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 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after
1293 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter, 1293 void ContentViewCoreImpl::UpdateImeAdapter(long native_ime_adapter,
1294 int text_input_type, 1294 int text_input_type,
1295 int text_input_flags, 1295 int text_input_flags,
1296 int text_input_mode, 1296 int text_input_mode,
1297 const std::string& text, 1297 const std::string& text,
1298 int selection_start, 1298 int selection_start,
1299 int selection_end, 1299 int selection_end,
1300 int composition_start, 1300 int composition_start,
1301 int composition_end, 1301 int composition_end,
1302 bool show_ime_if_needed, 1302 bool show_ime_if_needed,
1303 bool is_non_ime_change) { 1303 bool reply_to_request) {
1304 JNIEnv* env = AttachCurrentThread(); 1304 JNIEnv* env = AttachCurrentThread();
1305 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); 1305 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
1306 if (obj.is_null()) 1306 if (obj.is_null())
1307 return; 1307 return;
1308 1308
1309 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text); 1309 ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text);
1310 Java_ContentViewCore_updateImeAdapter( 1310 Java_ContentViewCore_updateImeAdapter(
1311 env, obj, native_ime_adapter, text_input_type, text_input_flags, 1311 env, obj, native_ime_adapter, text_input_type, text_input_flags,
1312 text_input_mode, jstring_text, selection_start, selection_end, 1312 text_input_mode, jstring_text, selection_start, selection_end,
1313 composition_start, composition_end, show_ime_if_needed, 1313 composition_start, composition_end, show_ime_if_needed, reply_to_request);
1314 is_non_ime_change);
1315 } 1314 }
1316 1315
1317 void ContentViewCoreImpl::SetAccessibilityEnabled( 1316 void ContentViewCoreImpl::SetAccessibilityEnabled(
1318 JNIEnv* env, 1317 JNIEnv* env,
1319 const JavaParamRef<jobject>& obj, 1318 const JavaParamRef<jobject>& obj,
1320 bool enabled) { 1319 bool enabled) {
1321 SetAccessibilityEnabledInternal(enabled); 1320 SetAccessibilityEnabledInternal(enabled);
1322 } 1321 }
1323 1322
1324 void ContentViewCoreImpl::SetTextTrackSettings( 1323 void ContentViewCoreImpl::SetTextTrackSettings(
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
1584 return ScopedJavaLocalRef<jobject>(); 1583 return ScopedJavaLocalRef<jobject>();
1585 1584
1586 return view->GetJavaObject(); 1585 return view->GetJavaObject();
1587 } 1586 }
1588 1587
1589 bool RegisterContentViewCore(JNIEnv* env) { 1588 bool RegisterContentViewCore(JNIEnv* env) {
1590 return RegisterNativesImpl(env); 1589 return RegisterNativesImpl(env);
1591 } 1590 }
1592 1591
1593 } // namespace content 1592 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/android/content_view_core_impl.h ('k') | content/browser/renderer_host/render_widget_host_view_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698