Fix a crash which occurs due to a CHECK firing in the HWNDMessageHandler::OnKeyEvent code path on W…

ui/views/win/hwnd_message_handler.cc

Index: ui/views/win/hwnd_message_handler.cc
diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc
index d23127df8ce817655dea9c7e55947a880a4789a5..650e555785173791c54c296a6c1cd0179d691fbb 100644
--- a/ui/views/win/hwnd_message_handler.cc
+++ b/ui/views/win/hwnd_message_handler.cc
@@ -1009,7 +1009,11 @@ LRESULT HWNDMessageHandler::HandleKeyboardMessage(unsigned int message,
                                                   LPARAM l_param,
                                                   bool* handled) {
   base::WeakPtr<HWNDMessageHandler> ref(weak_factory_.GetWeakPtr());
-  LRESULT ret = OnKeyEvent(message, w_param, l_param);
+  LRESULT ret = 0;
+  if ((message == WM_CHAR) || (message == WM_SYSCHAR))

[sky, 2015/01/28 20:08:23]

Isn't it possible for HandleKeyboardMessage to be invoked outside of legacy
hwnd? Should you only special case the path when events are forwarded from
legacy hwnd?

[ananta, 2015/01/28 20:27:42]

I don't think we need to special case here.

All keyboard messages including the WM_CHAR/WM_SYSCHAR messages fall between
WM_KEYFIRST and WM_KEYLAST. Currently the only way to send keyboard and
character messages via WindowEventTarget is HandleKeyboardMessage. We should be
ok here.

+    ret = OnImeMessages(message, w_param, l_param);
+  else
+    ret = OnKeyEvent(message, w_param, l_param);
   *handled = IsMsgHandled();
   return ret;
 }