Upstream Android IME support (ImeAdapter).

content/browser/android/content_view_core_impl.cc

Index: content/browser/android/content_view_core_impl.cc
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
index 8be557c2181981090594d759bc9e00226b7f38fe..2282ed6829c259afffa7b9d1b98b521e699ec15e 100644
--- a/content/browser/android/content_view_core_impl.cc
+++ b/content/browser/android/content_view_core_impl.cc
@@ -476,6 +476,13 @@ int ContentViewCoreImpl::GetNavigationHistory(JNIEnv* env,
   return controller.GetCurrentEntryIndex();
 }
 
+int ContentViewCoreImpl::GetNativeImeAdapter(JNIEnv* env, jobject obj) {
+  RenderWidgetHostViewAndroid* rwhva = GetRenderWidgetHostViewAndroid();
+  if (!rwhva)
+    return 0;
+  return rwhva->GetNativeImeAdapter();
+}
+
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------
@@ -517,6 +524,28 @@ void ContentViewCoreImpl::OnTabCrashed(const base::ProcessHandle handle) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
+void ContentViewCoreImpl::ImeUpdateAdapter(int native_ime_adapter,
+                                           int text_input_type,
+                                           const std::string& text,
+                                           int selection_start,
+                                           int selection_end,
+                                           int composition_start,
+                                           int composition_end,
+                                           bool show_ime_if_needed) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+
+  ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text);
+  Java_ContentViewCore_imeUpdateAdapter(env, obj.obj(),
+                                        native_ime_adapter, text_input_type,
+                                        jstring_text.obj(),
+                                        selection_start, selection_end,
+                                        composition_start, composition_end,
+                                        show_ime_if_needed);
+}
+
 void ContentViewCoreImpl::SetTitle(const string16& title) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }