Disable Find-In-Page buttons when no text is entered

chrome/browser/ui/views/find_bar_host.cc

 // Copyright (c) 2012 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/ui/views/find_bar_host.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
@@ skipping 123 matching lines @@
 base::string16 FindBarHost::GetFindText() {
   return find_bar_view()->GetFindText();
 }
 
 gfx::Range FindBarHost::GetSelectedRange() {
   return find_bar_view()->GetSelectedRange();
 }
 
 void FindBarHost::UpdateUIForFindResult(const FindNotificationDetails& result,
                                         const base::string16& find_text) {
-  // Make sure match count is clear. It may get set again in UpdateForResult
-  // if enough data is available.
-  find_bar_view()->ClearMatchCount();
-
   if (!find_text.empty())
     find_bar_view()->UpdateForResult(result, find_text);
+  else
+    find_bar_view()->ClearMatchCount();

[msw, 2016/03/14 17:30:10]

AFAICT, the regression was just from FindBarView::UpdateMatchCountAppearance's
&& -> || change; shouldn't reverting that be sufficient? Why do we want to
change this? (explain in CL description or comment here)

[Mario Pistrich, 2016/03/14 17:52:46]

Reverting only the change of && -> || would reintroduce the initial bug
(https://crrev.com/1660273003).

FindBarView::UpdateMatchCountAppearance was the wrong place to fix the issue.
The initial bug is caused by always calling FindBarView::ClearMatchCount,
regardless of |find_text|. This temporarily disables the buttons and causes the
focus to jump to the close button (if they were focused before).
If FindBarView::ClearMatchCount is only called when the text is empty, the focus
stays on the buttons as they are not getting temporarily disabled.

[msw, 2016/03/14 18:10:32]

Okay, that's reasonable; thanks for the fix and explanation.

 
   // We now need to check if the window is obscuring the search results.
   MoveWindowIfNecessary(result.selection_rect());
 
   // Once we find a match we no longer want to keep track of what had
   // focus. EndFindSession will then set the focus to the page content.
   if (result.number_of_matches() > 0)
     ResetFocusTracker();
 }
 
@@ skipping 194 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // private:
 
 void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) {
   gfx::Rect frame_rect = host()->GetTopLevelWidget()->GetWindowBoundsInScreen();
   gfx::Rect webcontents_rect =
       find_bar_controller_->web_contents()->GetViewBounds();
   avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y());
 }