Find should allow keyboard scrolling while Find bar has focus

chrome/browser/views/options/general_page_view.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// 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/views/options/general_page_view.h"
 
 #include "base/gfx/png_decoder.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser.h"
@@ skipping 77 matching lines @@
 
   // Updates the UI in our associated view with the current default browser
   // state.
   void UpdateUI(bool is_default);
 
   GeneralPageView* general_page_view_;
 
   MessageLoop* ui_loop_;
   MessageLoop* file_loop_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(GeneralPageView::DefaultBrowserWorker);
+  DISALLOW_COPY_AND_ASSIGN(GeneralPageView::DefaultBrowserWorker);
 };
 
 GeneralPageView::DefaultBrowserWorker::DefaultBrowserWorker(
     GeneralPageView* general_page_view)
     : general_page_view_(general_page_view),
       ui_loop_(MessageLoop::current()),
       file_loop_(g_browser_process->file_thread()->message_loop()) {
 }
 
 void GeneralPageView::DefaultBrowserWorker::StartCheckDefaultBrowser() {
@@ skipping 122 matching lines @@
   static SkBitmap default_favicon_;
 
   // Profile used to load icons.
   Profile* profile_;
 
   views::TableModelObserver* observer_;
 
   // Used in loading favicons.
   CancelableRequestConsumer fav_icon_consumer_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CustomHomePagesTableModel);
+  DISALLOW_COPY_AND_ASSIGN(CustomHomePagesTableModel);
 };
 
 // static
 SkBitmap CustomHomePagesTableModel::default_favicon_;
 
 CustomHomePagesTableModel::CustomHomePagesTableModel(Profile* profile)
     : profile_(profile),
       observer_(NULL) {
   InitClass();
 }
@@ skipping 158 matching lines @@
 
   TemplateURLModel* template_url_model_;
 
   // The combobox hosting us.
   views::ComboBox* combo_box_;
 
   // The TemplateURLs we're showing.
   typedef std::vector<const TemplateURL*> TemplateURLs;
   TemplateURLs template_urls_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(SearchEngineListModel);
+  DISALLOW_COPY_AND_ASSIGN(SearchEngineListModel);
 };
 
 SearchEngineListModel::SearchEngineListModel(Profile* profile)
     : template_url_model_(profile->GetTemplateURLModel()),
       combo_box_(NULL) {
   if (template_url_model_) {
     template_url_model_->Load();
     template_url_model_->AddObserver(this);
   }
   ResetContents();
@@ skipping 175 matching lines @@
     // If the text field contains a valid URL, sync it to prefs. We run it
     // through the fixer upper to allow input like "google.com" to be converted
     // to something valid ("http://google.com").
     std::wstring url_string = URLFixerUpper::FixupURL(
         homepage_use_url_textfield_->GetText(), std::wstring());
     if (GURL(url_string).is_valid())
       SetHomepage(url_string);
   }
 }
 
-void GeneralPageView::HandleKeystroke(views::TextField* sender,
+bool GeneralPageView::HandleKeystroke(views::TextField* sender,
                                       UINT message, TCHAR key,
                                       UINT repeat_count, UINT flags) {
-  // Not necessary.
+  return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // GeneralPageView, OptionsPageView implementation:
 
 void GeneralPageView::InitControlLayout() {
   using views::GridLayout;
   using views::ColumnSet;
 
   GridLayout* layout = new GridLayout(this);
@@ skipping 447 matching lines @@
     homepage_use_url_textfield_->SetEnabled(false);
     homepage_use_url_textfield_->SetReadOnly(true);
   }
 }
 
 void GeneralPageView::SetDefaultSearchProvider() {
   const int index = default_search_engine_combobox_->GetSelectedItem();
   default_search_engines_model_->model()->SetDefaultSearchProvider(
       default_search_engines_model_->GetTemplateURLAt(index));
 }