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

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

Issue 2137503002: Revert of Replace string::find(prefix) == 0 pattern with base::StartsWith(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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
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"
11 #include "base/strings/string_util.h"
12 #include "build/build_config.h" 11 #include "build/build_config.h"
13 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
14 #include "chrome/browser/profiles/profile.h" 13 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/ui/find_bar/find_bar.h" 14 #include "chrome/browser/ui/find_bar/find_bar.h"
16 #include "chrome/browser/ui/find_bar/find_bar_state.h" 15 #include "chrome/browser/ui/find_bar/find_bar_state.h"
17 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" 16 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
18 #include "chrome/browser/ui/find_bar/find_tab_helper.h" 17 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
19 #include "content/public/browser/navigation_details.h" 18 #include "content/public/browser/navigation_details.h"
20 #include "content/public/browser/navigation_entry.h" 19 #include "content/public/browser/navigation_entry.h"
21 #include "content/public/browser/notification_details.h" 20 #include "content/public/browser/notification_details.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 if (type == chrome::NOTIFICATION_FIND_RESULT_AVAILABLE) { 136 if (type == chrome::NOTIFICATION_FIND_RESULT_AVAILABLE) {
138 // Don't update for notifications from WebContentses other than the one we 137 // Don't update for notifications from WebContentses other than the one we
139 // are actively tracking. 138 // are actively tracking.
140 if (content::Source<WebContents>(source).ptr() == web_contents_) { 139 if (content::Source<WebContents>(source).ptr() == web_contents_) {
141 UpdateFindBarForCurrentResult(); 140 UpdateFindBarForCurrentResult();
142 if (find_tab_helper->find_result().final_update() && 141 if (find_tab_helper->find_result().final_update() &&
143 find_tab_helper->find_result().number_of_matches() == 0) { 142 find_tab_helper->find_result().number_of_matches() == 0) {
144 const base::string16& last_search = 143 const base::string16& last_search =
145 find_tab_helper->previous_find_text(); 144 find_tab_helper->previous_find_text();
146 const base::string16& current_search = find_tab_helper->find_text(); 145 const base::string16& current_search = find_tab_helper->find_text();
147 if (base::StartsWith(last_search, current_search, 146 if (last_search.find(current_search) != 0)
148 base::CompareCase::SENSITIVE)) {
149 find_bar_->AudibleAlert(); 147 find_bar_->AudibleAlert();
150 }
151 } 148 }
152 } 149 }
153 } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) { 150 } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
154 NavigationController* source_controller = 151 NavigationController* source_controller =
155 content::Source<NavigationController>(source).ptr(); 152 content::Source<NavigationController>(source).ptr();
156 if (source_controller == &web_contents_->GetController()) { 153 if (source_controller == &web_contents_->GetController()) {
157 content::LoadCommittedDetails* commit_details = 154 content::LoadCommittedDetails* commit_details =
158 content::Details<content::LoadCommittedDetails>(details).ptr(); 155 content::Details<content::LoadCommittedDetails>(details).ptr();
159 ui::PageTransition transition_type = 156 ui::PageTransition transition_type =
160 commit_details->entry->GetTransitionType(); 157 commit_details->entry->GetTransitionType();
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 } 250 }
254 251
255 // Update the find bar with existing results and search text, regardless of 252 // 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 253 // 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 254 // 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 255 // _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. 256 // clear the result count display when there's nothing in the box.
260 find_bar_->SetFindTextAndSelectedRange(find_string, 257 find_bar_->SetFindTextAndSelectedRange(find_string,
261 find_tab_helper->selected_range()); 258 find_tab_helper->selected_range());
262 } 259 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_navigator_browsertest.cc ('k') | chrome/test/chromedriver/net/adb_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698