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

chrome/browser/views/find_bar_view.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_view.h"
 
 #include <algorithm>
 
 #include "base/string_util.h"
 #include "chrome/browser/find_bar_controller.h"
@@ skipping 461 matching lines @@
     UpdateForResult(controller->web_contents()->find_result(), std::wstring());
   }
 }
 
 bool FindBarView::HandleKeystroke(views::TextField* sender, UINT message,
                                   TCHAR key, UINT repeat_count, UINT flags) {
   // If the dialog is not visible, there is no reason to process keyboard input.
   if (!container_->IsVisible())
     return false;
 
+  // TODO(port): Handle this for other platforms.
+  #if defined(OS_WIN)
+  if (container_->MaybeForwardKeystrokeToWebpage(message, key, flags))
+    return true;  // Handled, we are done!
+  #endif
+
   switch (key) {
     case VK_RETURN: {
       // Pressing Return/Enter starts the search (unless text box is empty).
       std::wstring find_string = find_text_->GetText();
       if (find_string.length() > 0) {
         // Search forwards for enter, backwards for shift-enter.
         container_->GetFindBarController()->web_contents()->StartFinding(
             find_string,
             GetKeyState(VK_SHIFT) >= 0);
       }
       break;
     }
-#if defined(OS_WIN)
-    // TODO(port): Handle this for other platforms.
-    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
-      container_->ForwardKeystrokeToWebpage(key);
-      return true;  // Message has been handled. No further processing needed.
-#endif
   }
 
   return false;
 }
 
 void FindBarView::ResetMatchCountBackground() {
   match_count_text_->set_background(
       views::Background::CreateSolidBackground(kBackgroundColorMatch));
   match_count_text_->SetColor(kTextColorMatchCount);
 }
 
 bool FindBarView::FocusForwarderView::OnMousePressed(
     const views::MouseEvent& event) {
   if (view_to_focus_on_mousedown_) {
     view_to_focus_on_mousedown_->ClearSelection();
     view_to_focus_on_mousedown_->RequestFocus();
   }
   return true;
 }