Chromium Code Reviews| 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 26d01f42162a2430ccfd6f79307dcaebf739be2b..9c64504cb2b802bab5f5d3f323bece1a69044826 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 |
| @@ -1394,7 +1394,6 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient { |
| } else { |
| undoScrollFocusedEditableNodeIntoViewIfNeeded(false); |
| } |
| - mImeAdapter.dispatchKeyEventPreIme(event); |
| return mContainerViewInternals.super_dispatchKeyEventPreIme(event); |
| } finally { |
| TraceEvent.end(); |
| @@ -1417,7 +1416,7 @@ public class ContentViewCore implements MotionEventDelegate, NavigationClient { |
| // to the renderer process. If mImeAdapter is bypassed or is not interested to the event, |
| // fall back to the default dispatcher to propagate the event to sub-views. |
| return (!getContentViewClient().shouldOverrideKeyEvent(event) |
| - && mImeAdapter.dispatchKeyEvent(event)) |
| + && (mKeyboardConnected && mImeAdapter.dispatchKeyEvent(event))) |
|
aurimas (slooooooooow)
2013/01/16 00:39:57
Could we rewrite this return statement into a clea
Yusuf
2013/01/16 08:07:57
Done.
|
| || mContainerViewInternals.super_dispatchKeyEvent(event); |
| } |