Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: chrome/browser/ui/find_bar/find_bar_controller.cc

Issue 2590673002: Fix a find_bar audible alert regression due to r404307. (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 5 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 if (type == chrome::NOTIFICATION_FIND_RESULT_AVAILABLE) { 137 if (type == chrome::NOTIFICATION_FIND_RESULT_AVAILABLE) {
138 // Don't update for notifications from WebContentses other than the one we 138 // Don't update for notifications from WebContentses other than the one we
139 // are actively tracking. 139 // are actively tracking.
140 if (content::Source<WebContents>(source).ptr() == web_contents_) { 140 if (content::Source<WebContents>(source).ptr() == web_contents_) {
141 UpdateFindBarForCurrentResult(); 141 UpdateFindBarForCurrentResult();
142 if (find_tab_helper->find_result().final_update() && 142 if (find_tab_helper->find_result().final_update() &&
143 find_tab_helper->find_result().number_of_matches() == 0) { 143 find_tab_helper->find_result().number_of_matches() == 0) {
144 const base::string16& last_search = 144 const base::string16& last_search =
145 find_tab_helper->previous_find_text(); 145 find_tab_helper->previous_find_text();
146 const base::string16& current_search = find_tab_helper->find_text(); 146 const base::string16& current_search = find_tab_helper->find_text();
147 if (base::StartsWith(last_search, current_search, 147 if (!base::StartsWith(last_search, current_search,
148 base::CompareCase::SENSITIVE)) { 148 base::CompareCase::SENSITIVE)) {
149 find_bar_->AudibleAlert(); 149 find_bar_->AudibleAlert();
150 } 150 }
151 } 151 }
152 } 152 }
153 } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) { 153 } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
154 NavigationController* source_controller = 154 NavigationController* source_controller =
155 content::Source<NavigationController>(source).ptr(); 155 content::Source<NavigationController>(source).ptr();
156 if (source_controller == &web_contents_->GetController()) { 156 if (source_controller == &web_contents_->GetController()) {
157 content::LoadCommittedDetails* commit_details = 157 content::LoadCommittedDetails* commit_details =
158 content::Details<content::LoadCommittedDetails>(details).ptr(); 158 content::Details<content::LoadCommittedDetails>(details).ptr();
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 } 253 }
254 254
255 // Update the find bar with existing results and search text, regardless of 255 // Update the find bar with existing results and search text, regardless of
256 // whether or not the find bar is visible, so that if it's subsequently 256 // whether or not the find bar is visible, so that if it's subsequently
257 // shown it is showing the right state for this tab. We update the find text 257 // shown it is showing the right state for this tab. We update the find text
258 // _first_ since the FindBarView checks its emptiness to see if it should 258 // _first_ since the FindBarView checks its emptiness to see if it should
259 // clear the result count display when there's nothing in the box. 259 // clear the result count display when there's nothing in the box.
260 find_bar_->SetFindTextAndSelectedRange(find_string, 260 find_bar_->SetFindTextAndSelectedRange(find_string,
261 find_tab_helper->selected_range()); 261 find_tab_helper->selected_range());
262 } 262 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698