summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHui Shu <hush@google.com>2014-12-03 10:15:54 -0800
committerHui Shu <hush@google.com>2014-12-03 10:15:54 -0800
commit48eef54c197d31144759c7f837427ef2d3a63a36 (patch)
treefc5f8c7e08ee634c1dfacf2b142ba36b97bc4da7
parent2e7495267cd2641ae800832c9996637794c948cc (diff)
downloadchromium_org-48eef54c197d31144759c7f837427ef2d3a63a36.tar.gz
Cherry pick: Attach ImeAdapter in CVC initialization.
This is a clean cherry pick from: https://crrev.com/06091eaf4543692caf7a0bcaf5c3a550dfca7078 We need to do this because in the Android WebView pop up flow, the native WebContents object could possibly have received RenderViewReady IPC message before the CVC is constructed and starts to observe the WebContents. BUG: 18527015 Change-Id: Ibccac065c0607bd2ec45c0a9e152128ea8805b7e
-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);