This patch changes the behavior of clear search button in cookies_view to wor...

chrome/browser/views/options/cookies_view.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/views/options/cookies_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/color_utils.h"
@@ skipping 32 matching lines @@
   virtual ~CookiesTableModel() {}
 
   // Returns information about the Cookie at the specified index.
   std::string GetDomainAt(int index);
   net::CookieMonster::CanonicalCookie& GetCookieAt(int index);
 
   // Remove the specified cookies from the Cookie Monster and update the view.
   void RemoveCookies(int start_index, int remove_count);
   void RemoveAllShownCookies();
 
-  // TableModel implementation:
+  // TableModel methods.
   virtual int RowCount();
   virtual std::wstring GetText(int row, int column_id);
   virtual SkBitmap GetIcon(int row);
+  virtual int CompareValues(int row1, int row2, int column_id);
   virtual void SetObserver(TableModelObserver* observer);
-  virtual int CompareValues(int row1, int row2, int column_id);
 
   // Filter the cookies to only display matched results.
   void UpdateSearchResults(const std::wstring& filter);
 
  private:
   void LoadCookies();
   void DoFilter();
 
   std::wstring filter_;
 
@@ skipping 54 matching lines @@
     // Delete the cookie from the monster
     monster->DeleteCookie(all_it->first, all_it->second, true);
     all_it = all_cookies_.erase(all_it);
   }
 
   // By deleting entries from all_cookies, we just possibly moved stuff around
   // and have thus invalidated all of our pointers, so rebuild shown_cookies.
   // We could do this all better if there was a way to mark elements of
   // all_cookies as dead instead of deleting, but this should be fine for now.
   DoFilter();
-  observer_->OnItemsRemoved(start_index, remove_count);
+  if (observer_)
+    observer_->OnItemsRemoved(start_index, remove_count);
 }
 
 void CookiesTableModel::RemoveAllShownCookies() {
   RemoveCookies(0, RowCount());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesTableModel, TableModel implementation:
 
 int CookiesTableModel::RowCount() {
@@ skipping 464 matching lines @@
 
 void CookiesView::OnTableViewDelete(views::TableView* table_view) {
   cookies_table_->RemoveSelectedCookies();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookiesView, views::Textfield::Controller implementation:
 
 void CookiesView::ContentsChanged(views::Textfield* sender,
                                   const std::wstring& new_contents) {
+  clear_search_button_->SetEnabled(!search_field_->text().empty());
   search_update_factory_.RevokeAll();
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       search_update_factory_.NewRunnableMethod(
           &CookiesView::UpdateSearchResults), kSearchFilterDelayMs);
 }
 
 bool CookiesView::HandleKeystroke(views::Textfield* sender,
                                   const views::Textfield::Keystroke& key) {
   if (views::Textfield::IsKeystrokeEscape(key)) {
     ResetSearchQuery();
@@ skipping 70 matching lines @@
       ALLOW_THIS_IN_INITIALIZER_LIST(search_update_factory_(this)) {
 }
 
 void CookiesView::Init() {
   search_label_ = new views::Label(
       l10n_util::GetString(IDS_COOKIES_SEARCH_LABEL));
   search_field_ = new views::Textfield;
   search_field_->SetController(this);
   clear_search_button_ = new views::NativeButton(
       this, l10n_util::GetString(IDS_COOKIES_CLEAR_SEARCH_LABEL));
+  clear_search_button_->SetEnabled(false);
   description_label_ = new views::Label(
       l10n_util::GetString(IDS_COOKIES_INFO_LABEL));
   description_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
 
   cookies_table_model_.reset(new CookiesTableModel(profile_));
   info_view_ = new CookieInfoView;
   std::vector<TableColumn> columns;
   columns.push_back(TableColumn(IDS_COOKIES_DOMAIN_COLUMN_HEADER,
                                 TableColumn::LEFT, 200, 0.5f));
   columns.back().sortable = true;
@@ skipping 56 matching lines @@
 
   if (cookies_table_->RowCount() > 0) {
     cookies_table_->Select(0);
   } else {
     UpdateForEmptyState();
   }
 }
 
 void CookiesView::ResetSearchQuery() {
   search_field_->SetText(EmptyWString());
+  clear_search_button_->SetEnabled(false);
   UpdateSearchResults();
 }
 
 void CookiesView::UpdateForEmptyState() {
   info_view_->ClearCookieDisplay();
   remove_button_->SetEnabled(false);
   remove_all_button_->SetEnabled(false);
 }