Fix bug 8369 and another regression

chrome/browser/views/find_bar_view.cc

 // Copyright (c) 2006-2008 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/tab_contents/web_contents.h"
@@ skipping 196 matching lines @@
     match_count_text_->SetText(
         l10n_util::GetStringF(IDS_FIND_IN_PAGE_COUNT,
                               IntToWString(result.active_match_ordinal()),
                               IntToWString(result.number_of_matches())));
   } else {
     // If there was no text entered, we don't show anything in the result count
     // area.
     match_count_text_->SetText(std::wstring());
   }
 
-  if (search_string.empty() || result.number_of_matches() > 0) {
+  if (search_string.empty() || result.number_of_matches() > 0 ||
+      !have_valid_range) {
     // If there was no text entered or there were results, the match_count label
-    // should have a normal background color.
+    // should have a normal background color. We also reset the background if
+    // we don't have_valid_range, so that the text field will not show red
+    // background when reopened after an unsuccessful find.
     ResetMatchCountBackground();
   } else if (result.final_update()) {
     // Otherwise we show an error background behind the match_count label.
     match_count_text_->set_background(
         views::Background::CreateSolidBackground(kBackgroundColorNoMatch));
     match_count_text_->SetColor(kTextColorNoMatch);
     MessageBeep(MB_OK);
   }
 
   // Make sure Find Next and Find Previous are enabled if we found any matches.
   find_previous_button_->SetEnabled(result.number_of_matches() > 0);
   find_next_button_->SetEnabled(result.number_of_matches() > 0);
 
   Layout();  // The match_count label may have increased/decreased in size.
 }
 
 void FindBarView::SetFocusAndSelection() {
   find_text_->RequestFocus();
-  find_text_->SelectAll();
+  if (!find_text_->GetText().empty()) {
+    find_text_->SelectAll();
+
+    find_previous_button_->SetEnabled(true);
+    find_next_button_->SetEnabled(true);
+  }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // FindBarView, views::View overrides:
 
 void FindBarView::Paint(ChromeCanvas* canvas) {
   SkPaint paint;
 
   // Get the local bounds so that we now how much to stretch the background.
   gfx::Rect lb = GetLocalBounds(true);
@@ skipping 239 matching lines @@
 }
 
 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;
 }