Find should allow keyboard scrolling while Find bar has focus

chrome/browser/views/options/cookies_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 <algorithm>
 
 #include "chrome/browser/views/options/cookies_view.h"
 
 #include "base/string_util.h"
 #include "base/time_format.h"
 #include "chrome/browser/profile.h"
@@ skipping 56 matching lines @@
   // The profile from which this model sources cookies.
   Profile* profile_;
 
   typedef net::CookieMonster::CookieList CookieList;
   typedef std::vector<net::CookieMonster::CookieListPair*> CookiePtrList;
   CookieList all_cookies_;
   CookiePtrList shown_cookies_;
 
   views::TableModelObserver* observer_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CookiesTableModel);
+  DISALLOW_COPY_AND_ASSIGN(CookiesTableModel);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTableModel, public:
 
 CookiesTableModel::CookiesTableModel(Profile* profile)
     : profile_(profile) {
   LoadCookies();
 }
 
@@ skipping 168 matching lines @@
                    std::vector<views::TableColumn> columns);
   virtual ~CookiesTableView() {}
 
   // Removes the cookies associated with the selected rows in the TableView.
   void RemoveSelectedCookies();
 
  private:
   // Our model, as a CookiesTableModel.
   CookiesTableModel* cookies_model_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CookiesTableView);
+  DISALLOW_COPY_AND_ASSIGN(CookiesTableView);
 };
 
 CookiesTableView::CookiesTableView(
     CookiesTableModel* cookies_model,
     std::vector<views::TableColumn> columns)
     : views::TableView(cookies_model, columns, views::ICON_AND_TEXT, false,
                        true, true),
       cookies_model_(cookies_model) {
 }
 
@@ skipping 68 matching lines @@
   views::TextField* domain_value_field_;
   views::Label* path_label_;
   views::TextField* path_value_field_;
   views::Label* send_for_label_;
   views::TextField* send_for_value_field_;
   views::Label* created_label_;
   views::TextField* created_value_field_;
   views::Label* expires_label_;
   views::TextField* expires_value_field_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(CookieInfoView);
+  DISALLOW_COPY_AND_ASSIGN(CookieInfoView);
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView, public:
 
 CookieInfoView::CookieInfoView()
     : name_label_(NULL),
       name_value_field_(NULL),
       content_label_(NULL),
       content_value_field_(NULL),
@@ skipping 246 matching lines @@
 // CookiesView, views::TextField::Controller implementation:
 
 void CookiesView::ContentsChanged(views::TextField* sender,
                                   const std::wstring& new_contents) {
   search_update_factory_.RevokeAll();
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       search_update_factory_.NewRunnableMethod(
           &CookiesView::UpdateSearchResults), kSearchFilterDelayMs);
 }
 
-void CookiesView::HandleKeystroke(views::TextField* sender, UINT message,
+bool CookiesView::HandleKeystroke(views::TextField* sender, UINT message,
                                   TCHAR key, UINT repeat_count, UINT flags) {
   switch (key) {
     case VK_ESCAPE:
       ResetSearchQuery();
       break;
     case VK_RETURN:
       search_update_factory_.RevokeAll();
       UpdateSearchResults();
       break;
   }
+  return false;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesView, views::DialogDelegate implementation:
 
 std::wstring CookiesView::GetWindowTitle() const {
   return l10n_util::GetString(IDS_COOKIES_WINDOW_TITLE);
 }
 
 void CookiesView::WindowClosing() {
@@ skipping 139 matching lines @@
 void CookiesView::ResetSearchQuery() {
   search_field_->SetText(EmptyWString());
   UpdateSearchResults();
 }
 
 void CookiesView::UpdateForEmptyState() {
   info_view_->ClearCookieDisplay();
   remove_button_->SetEnabled(false);
   remove_all_button_->SetEnabled(false);
 }