Fix: Find box forwarding scroll messages to the page when it shouldn't

chrome/browser/views/find_bar_win.cc

 // Copyright (c) 2006-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/views/find_bar_win.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 214 matching lines @@
     return;
   }
 
   gfx::Rect new_pos = GetDialogPosition(selection_rect);
   SetDialogPosition(new_pos, no_redraw);
 
   // May need to redraw our frame to accommodate bookmark bar styles.
   view_->SchedulePaint();
 }
 
-void FindBarWin::ForwardKeystrokeToWebpage(TCHAR key) {
+bool FindBarWin::MaybeForwardKeystrokeToWebpage(
+    UINT message, TCHAR key, UINT flags) {
+  // We specifically ignore WM_CHAR. See http://crbug.com/10509.
+  if (message != WM_KEYDOWN && message != WM_KEYUP)
+    return false;
+
+  switch (key) {
+    case VK_HOME:
+    case VK_END:
+      // Ctrl+Home and Ctrl+End should be forwarded to the page.
+      if (GetKeyState(VK_CONTROL) >= 0)
+        return false;  // Ctrl not pressed: Abort. Otherwise fall through.
+    case VK_UP:
+    case VK_DOWN:
+    case VK_PRIOR:  // Page up
+    case VK_NEXT:   // Page down
+      break;  // The keys above are the ones we want to forward to the page.
+    default:
+      return false;
+  }
+
   WebContents* contents = find_bar_controller_->web_contents();
   if (!contents)
-    return;
+    return false;
 
   RenderViewHost* render_view_host = contents->render_view_host();
 
   // Make sure we don't have a text field element interfering with keyboard
   // input. Otherwise Up and Down arrow key strokes get eaten. "Nom Nom Nom".
   render_view_host->ClearFocusedNode();
 
   HWND hwnd = contents->GetContentNativeView();
   render_view_host->ForwardKeyboardEvent(
-      NativeWebKeyboardEvent(hwnd, WM_KEYDOWN, key, 0));
-  render_view_host->ForwardKeyboardEvent(
-      NativeWebKeyboardEvent(hwnd, WM_KEYUP, key, 0));
+      NativeWebKeyboardEvent(hwnd, message, key, 0));
+  return true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // FindBarWin, views::WidgetWin implementation:
 
 void FindBarWin::OnFinalMessage(HWND window) {
   // TODO(beng): Destroy the RootView before destroying the Focus Manager will
   //             allow us to remove this method.
 
   // We are exiting, so we no longer need to monitor focus changes.
@@ skipping 262 matching lines @@
 
   // We now need to check if the window is obscuring the search results.
   if (!result.selection_rect().IsEmpty())
     MoveWindowIfNecessary(result.selection_rect(), false);
 
   // Once we find a match we no longer want to keep track of what had
   // focus. EndFindSession will then set the focus to the page content.
   if (result.number_of_matches() > 0)
     focus_tracker_.reset(NULL);
 }