summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Shu <hush@google.com>2014-12-03 18:45:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-03 18:45:24 +0000
commit930af317ad725fdc2a512aa7ddacfb8e33a74763 (patch)
treefbbc88e49cb625c38e365969c8fc5ce33de8c112
parent27bf38b1f54481a4168f6630e5b71bed9dd803c6 (diff)
parent48eef54c197d31144759c7f837427ef2d3a63a36 (diff)
downloadchromium_org-930af317ad725fdc2a512aa7ddacfb8e33a74763.tar.gz
Merge "Cherry pick: Attach ImeAdapter in CVC initialization." into m39
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 3140e22e87..b15467c598 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -625,6 +625,7 @@ public class ContentViewCore
mRenderCoordinates.reset();
initPopupZoomer(mContext);
mImeAdapter = createImeAdapter(mContext);
+ attachImeAdapter();
mAccessibilityInjector = AccessibilityInjector.newInstance(this);