Revert 31877 - Revert 31869 Ignore keyboard messages from enter key in rende...

chrome/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/gdi_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
@@ skipping 198 matching lines @@
   return new RenderWidgetHostViewWin(widget);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewWin, public:
 
 RenderWidgetHostViewWin::RenderWidgetHostViewWin(RenderWidgetHost* widget)
     : render_widget_host_(widget),
       track_mouse_leave_(false),
       ime_notification_(false),
+      capture_enter_key_(false),
       is_hidden_(false),
       about_to_validate_and_paint_(false),
       close_on_deactivate_(false),
       being_destroyed_(false),
       tooltip_hwnd_(NULL),
       tooltip_showing_(false),
       shutdown_factory_(this),
       parent_hwnd_(NULL),
       is_loading_(false) {
   render_widget_host_->set_view(this);
@@ skipping 951 matching lines @@
         // It is harmless to call this function if we aren't going to send it.
         render_widget_host_->CancelUpdateTextDirection();
       }
     } else if (message == WM_KEYUP &&
                (wparam == VK_SHIFT || wparam == VK_CONTROL)) {
       // We send an IPC message only if we need to update the text direction.
       render_widget_host_->NotifyTextDirection();
     }
   }
 
-  if (render_widget_host_) {
+  // Special processing for enter key: When user hits enter in omnibox
+  // we change focus to render host after the navigation, so repeat WM_KEYDOWNs
+  // and WM_KEYUP are going to render host, despite being initiated in other
+  // window. This code filters out these messages.
+  bool ignore_keyboard_event = false;
+  if (wparam == VK_RETURN) {
+    if (message == WM_KEYDOWN) {
+      if (KF_REPEAT & HIWORD(lparam)) {
+        // this is a repeated key
+        if (!capture_enter_key_)
+          ignore_keyboard_event = true;
+      } else {
+        capture_enter_key_ = true;
+      }
+    } else if (message == WM_KEYUP) {
+      if (!capture_enter_key_)
+        ignore_keyboard_event = true;
+      capture_enter_key_ = false;
+    } else {
+      // Ignore all other keyboard events for the enter key if not captured.
+      if (!capture_enter_key_)
+        ignore_keyboard_event = true;
+    }
+  }
+
+  if (render_widget_host_ && !ignore_keyboard_event) {
     render_widget_host_->ForwardKeyboardEvent(
         NativeWebKeyboardEvent(m_hWnd, message, wparam, lparam));
   }
   return 0;
 }
 
 LRESULT RenderWidgetHostViewWin::OnWheelEvent(UINT message, WPARAM wparam,
                                               LPARAM lparam, BOOL& handled) {
   // Forward the mouse-wheel message to the window under the mouse if it belongs
   // to us.
@@ skipping 212 matching lines @@
     SetFocus();
   }
 }
 
 void RenderWidgetHostViewWin::ShutdownHost() {
   shutdown_factory_.RevokeAll();
   if (render_widget_host_)
     render_widget_host_->Shutdown();
   // Do not touch any members at this point, |this| has been deleted.
 }