Upstream Android IME support (ImeAdapter).

content/browser/renderer_host/ime_adapter_android.h

Index: content/browser/renderer_host/ime_adapter_android.h
diff --git a/content/browser/renderer_host/ime_adapter_android.h b/content/browser/renderer_host/ime_adapter_android.h
index 768e9d80ea83a1d4fb42143b0885b563b5ef68ed..8f36799c7fd14f225469afd76759848295ad1cae 100644
--- a/content/browser/renderer_host/ime_adapter_android.h
+++ b/content/browser/renderer_host/ime_adapter_android.h
@@ -25,12 +25,35 @@ class ImeAdapterAndroid {
   // Called from java -> native
   // The java side is responsible to translate android KeyEvent various enums
   // and values into the corresponding WebKit::WebInputEvent.
+  bool SendKeyEvent(JNIEnv* env, jobject,
+                    jobject original_key_event,
+                    int action, int meta_state,
+                    long event_time, int key_code,
+                    bool is_system_key, int unicode_text);
+  // |event_type| is a value of WebInputEvent::Type.
+  bool SendSyntheticKeyEvent(JNIEnv*,
+                             jobject,
+                             int event_type,
+                             long timestamp_ms,
+                             int native_key_code,
+                             int unicode_char);
+  void SetComposingText(JNIEnv*, jobject, jstring text, int new_cursor_pos);
+  void CommitText(JNIEnv*, jobject, jstring text);
+  void AttachImeAdapter(JNIEnv*, jobject java_object);
+  void ReplaceText(JNIEnv*, jobject, jstring text);
+  void ClearFocus(JNIEnv*, jobject);
+  void SetEditableSelectionOffsets(JNIEnv*, jobject, int start, int end);
+  void SetComposingRegion(JNIEnv*, jobject, int start, int end);
+  void DeleteSurroundingText(JNIEnv*, jobject, int before, int after);
   void Unselect(JNIEnv*, jobject);
   void SelectAll(JNIEnv*, jobject);
   void Cut(JNIEnv*, jobject);
   void Copy(JNIEnv*, jobject);
   void Paste(JNIEnv*, jobject);
 
+  // Called from native -> java
+  void CancelComposition();
+
  private:
   RenderWidgetHostViewAndroid* rwhva_;
   jobject java_ime_adapter_;