Index: content/renderer/render_widget.cc |
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc |
index 0d59d32116cb54d7a18fb264ac2d95e5cb55eb8c..f814d478883c12a89f06a86ab51af6a9c6fff6b6 100644 |
--- a/content/renderer/render_widget.cc |
+++ b/content/renderer/render_widget.cc |
@@ -703,6 +703,7 @@ bool RenderWidget::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection) |
IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck) |
IPC_MESSAGE_HANDLER(ViewMsg_UpdateScreenRects, OnUpdateScreenRects) |
+ IPC_MESSAGE_HANDLER(ViewMsg_FocusChangeComplete, FocusChangeComplete) |
#if defined(OS_ANDROID) |
IPC_MESSAGE_HANDLER(ViewMsg_ShowImeIfNeeded, OnShowImeIfNeeded) |
IPC_MESSAGE_HANDLER(ViewMsg_ImeEventAck, OnImeEventAck) |
@@ -1240,9 +1241,9 @@ void RenderWidget::OnHandleInputEvent(const blink::WebInputEvent* input_event, |
DidHandleTouchEvent(*(static_cast<const WebTouchEvent*>(input_event))); |
} |
-// TODO(rouslan): Fix ChromeOS and Windows 8 behavior of autofill popup with |
-// virtual keyboard. |
-#if !defined(OS_ANDROID) |
+// TODO(rouslan): Fix Windows 8 behavior of autofill popup with virtual |
+// keyboard. |
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
// Virtual keyboard is not supported, so react to focus change immediately. |
if (processed && (input_event->type == WebInputEvent::TouchEnd || |
input_event->type == WebInputEvent::MouseUp)) { |
@@ -1705,9 +1706,9 @@ void RenderWidget::OnShowImeIfNeeded() { |
UpdateTextInputState(SHOW_IME_IF_NEEDED, FROM_NON_IME); |
#endif |
-// TODO(rouslan): Fix ChromeOS and Windows 8 behavior of autofill popup with |
-// virtual keyboard. |
-#if !defined(OS_ANDROID) |
+// TODO(rouslan): Fix Windows 8 behavior of autofill popup with virtual |
+// keyboard. |
+#if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
FocusChangeComplete(); |
#endif |
} |