Upstream Android IME support (ImeAdapter).

content/public/browser/android/content_view_core.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
 #define CONTENT_PUBLIC_BROWSER_ANDROID_CONTENT_VIEW_CORE_H_
 
 #include <jni.h>
 
 class GURL;
@@ skipping 17 matching lines @@
 // until this issue is resolved.
 // http://b/6666045
 class ContentViewCore {
  public:
   virtual void Destroy(JNIEnv* env, jobject obj) = 0;
 
   static ContentViewCore* Create(JNIEnv* env, jobject obj,
                                  WebContents* web_contents);
   static ContentViewCore* GetNativeContentViewCore(JNIEnv* env, jobject obj);
 
+  // --------------------------------------------------------------------------
+  // Methods called from Java via JNI
+  // --------------------------------------------------------------------------
+
+  virtual int GetNativeImeAdapter(JNIEnv* env, jobject obj) = 0;
+
+  // --------------------------------------------------------------------------
+  // Methods called from native code
+  // --------------------------------------------------------------------------
+
   virtual base::android::ScopedJavaLocalRef<jobject> GetJavaObject() = 0;
 
  protected:
   virtual ~ContentViewCore() {};
 };
 
 };  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_CONTENT_VIEW_CORE_H_