Fix ime adapter type to satisfy 64-bit

BUG=346626, 354405 Review URL: https://codereview.chromium.org/242393002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265240 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Apr 22, 2014 · 427134e · 427134e
1 parent f7fc72c
commit 427134e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
@@ -1504,7 +1504,7 @@ ContentViewCoreImpl::GetOriginalUrlForActiveNavigationEntry(JNIEnv* env,
   return ConvertUTF8ToJavaString(env, entry->GetOriginalRequestURL().spec());
 }
 
-int ContentViewCoreImpl::GetNativeImeAdapter(JNIEnv* env, jobject obj) {
+long ContentViewCoreImpl::GetNativeImeAdapter(JNIEnv* env, jobject obj) {
   RenderWidgetHostViewAndroid* rwhva = GetRenderWidgetHostViewAndroid();
   if (!rwhva)
     return 0;

diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
@@ -164,7 +164,7 @@ class ContentViewCoreImpl : public ContentViewCore,
                           jstring script,
                           jobject callback,
                           jboolean start_renderer);
-  int GetNativeImeAdapter(JNIEnv* env, jobject obj);
+  long GetNativeImeAdapter(JNIEnv* env, jobject obj);
   void SetFocus(JNIEnv* env, jobject obj, jboolean focused);
   void ScrollFocusedEditableNodeIntoView(JNIEnv* env, jobject obj);