Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
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 69d11cf978e8029adf93e805b3e2ad632d3cddc1..d3040c9862e0d1561fc1aef03f3ccdd5ff9297b0 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 |
@@ -748,8 +748,8 @@ public class ContentViewCore implements |
} |
private ImeAdapter createImeAdapter() { |
- return new ImeAdapter(mInputMethodManagerWrapper, |
- new ImeAdapter.ImeAdapterDelegate() { |
+ return new ImeAdapter( |
+ mInputMethodManagerWrapper, new ImeAdapter.ImeAdapterDelegate() { |
@Override |
public void onImeEvent() { |
mPopupZoomer.hide(true); |
@@ -812,8 +812,7 @@ public class ContentViewCore implements |
} |
}; |
} |
- } |
- ); |
+ }); |
} |
/** |
@@ -2473,8 +2472,8 @@ public class ContentViewCore implements |
boolean focusedNodeIsPassword = (textInputType == TextInputType.PASSWORD); |
if (!focusedNodeEditable) hidePastePopup(); |
- mImeAdapter.updateKeyboardVisibility( |
- nativeImeAdapterAndroid, textInputType, textInputFlags, showImeIfNeeded); |
+ mImeAdapter.attach(nativeImeAdapterAndroid); |
+ mImeAdapter.updateKeyboardVisibility(textInputType, textInputFlags, showImeIfNeeded); |
if (mInputConnection != null) { |
mInputConnection.updateState(text, selectionStart, selectionEnd, compositionStart, |
@@ -2664,7 +2663,6 @@ public class ContentViewCore implements |
} |
private boolean canPaste() { |
- if (!mFocusedNodeEditable) return false; |
return ((ClipboardManager) mContext.getSystemService( |
Context.CLIPBOARD_SERVICE)).hasPrimaryClip(); |
} |