Handling new frames and frame navigations with find-in-page during a find session.

chrome/browser/ui/find_bar/find_bar_controller.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/find_bar/find_bar_controller.h"
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 141 matching lines @@
     }
   } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationController* source_controller =
         content::Source<NavigationController>(source).ptr();
     if (source_controller == &web_contents_->GetController()) {
       content::LoadCommittedDetails* commit_details =
           content::Details<content::LoadCommittedDetails>(details).ptr();
       ui::PageTransition transition_type =
           commit_details->entry->GetTransitionType();
       // Hide the find bar on reload or navigation.
-      if (find_bar_->IsFindBarVisible() &&
+      if (find_bar_->IsFindBarVisible() && commit_details->is_main_frame &&

[dcheng, 2016/09/21 07:15:44]

Please commenton this fixin the CL description too (I assume this is to keep the
find bar from disappearing for subframe navigations)

[paulmeyer, 2016/09/21 15:40:52]

Done.

           (ui::PageTransitionCoreTypeIs(transition_type,
                                         ui::PAGE_TRANSITION_RELOAD) ||
            commit_details->is_navigation_to_different_page()))
         EndFindSession(kKeepSelectionOnPage, kClearResultsInFindBox);
     }
   }
 }
 
 // static
 gfx::Rect FindBarController::GetLocationForFindbarView(
@@ skipping 80 matching lines @@
   }
 
   // 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
   // _first_ since the FindBarView checks its emptiness to see if it should
   // clear the result count display when there's nothing in the box.
   find_bar_->SetFindTextAndSelectedRange(find_string,
                                          find_tab_helper->selected_range());
 }