summaryrefslogtreecommitdiffstats
path: root/chrome/browser/find_bar_controller.cc
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-02 20:07:15 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-02 20:07:15 +0000
commitaead92ea5e4ce873f4f956e6b42870ae6952759e (patch)
tree06bdc9117a12f7ee3ddf91694b83e507b3ed09ce /chrome/browser/find_bar_controller.cc
parent1a4a8d92f08440dbcf33d484f7a74a0d8293a2c3 (diff)
downloadchromium_src-aead92ea5e4ce873f4f956e6b42870ae6952759e.zip
chromium_src-aead92ea5e4ce873f4f956e6b42870ae6952759e.tar.gz
chromium_src-aead92ea5e4ce873f4f956e6b42870ae6952759e.tar.bz2
Bug 2220 lists two cases where the inactive highlighting doesn't reappear on FindNext. This is a simple fix for one of those cases (user presses Refresh after Find).
BUG=2220 TEST=Open google.com, press Find, press e, press Refresh, press F3 (or FindNext button in UI). Then make sure the inactive matches are highlighted (not just the active match). Review URL: http://codereview.chromium.org/56193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13028 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/find_bar_controller.cc')
-rw-r--r--chrome/browser/find_bar_controller.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/find_bar_controller.cc b/chrome/browser/find_bar_controller.cc
index c9c6d51..adb7c067 100644
--- a/chrome/browser/find_bar_controller.cc
+++ b/chrome/browser/find_bar_controller.cc
@@ -125,10 +125,15 @@ void FindBarController::Observe(NotificationType type,
commit_details->entry->transition_type();
// We hide the FindInPage window when the user navigates away, except on
// reload.
- if (find_bar_->IsFindBarVisible() &&
- PageTransition::StripQualifier(transition_type) !=
- PageTransition::RELOAD) {
- EndFindSession();
+ if (find_bar_->IsFindBarVisible()) {
+ if (PageTransition::StripQualifier(transition_type) !=
+ PageTransition::RELOAD) {
+ EndFindSession();
+ } else {
+ // On Reload we want to make sure FindNext is converted to a full Find
+ // to make sure highlights for inactive matches are repainted.
+ web_contents_->set_find_op_aborted(true);
+ }
}
}
}