Fix 8063: Find-in-page remains open on History/Downloads page...

chrome/browser/views/find_bar_win.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_win.h"
 
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/view_ids.h"
@@ skipping 207 matching lines @@
         Source<TabContents>(web_contents_));
     NotificationService::current()->RemoveObserver(
         this, NotificationType::NAV_ENTRY_COMMITTED,
         Source<NavigationController>(web_contents_->controller()));
     if (animation_->IsAnimating())
       animation_->End();
   }
 
   web_contents_ = contents;
 
+  // Hide any visible find window from the previous tab if NULL |web_contents|
+  // is passed in or if the find UI is not active in the new tab.
+  if (IsVisible() && (!web_contents_ || !web_contents_->find_ui_active()))
+    ShowWindow(SW_HIDE);
+
   if (web_contents_) {
-    if (IsVisible() && web_contents_ && !web_contents_->find_ui_active())
-      ShowWindow(SW_HIDE);
-
     NotificationService::current()->AddObserver(
         this, NotificationType::FIND_RESULT_AVAILABLE,
         Source<TabContents>(web_contents_));
     NotificationService::current()->AddObserver(
         this, NotificationType::NAV_ENTRY_COMMITTED,
         Source<NavigationController>(web_contents_->controller()));
 
     // Update the find bar with existing results and search text, regardless of
     // whether or not the find bar is visible, so that if it's subsequently
     // shown it is showing the right state for this tab. We update the find text
@@ skipping 313 matching lines @@
 
   // We now need to check if the window is obscuring the search results.
   if (!result.selection_rect().IsEmpty())
     MoveWindowIfNecessary(result.selection_rect(), false);
 
   // 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)
     focus_tracker_.reset(NULL);
 }