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

Unified Diff: chrome/browser/ui/find_bar/find_tab_helper.cc

Issue 1851793002: Implement a shell of FindRequestManager, and hook it up to WebContentsImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased and small fix. Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/browser/find_helper.cc ('k') | content/browser/find_request_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/find_bar/find_tab_helper.cc
diff --git a/chrome/browser/ui/find_bar/find_tab_helper.cc b/chrome/browser/ui/find_bar/find_tab_helper.cc
index 92b64a2dc41f4c9ba7b4e74ef4ba5b10426dd882..c946502154cbb74152eb30ece61aab3bef1dcc26 100644
--- a/chrome/browser/ui/find_bar/find_tab_helper.cc
+++ b/chrome/browser/ui/find_bar/find_tab_helper.cc
@@ -77,8 +77,8 @@ void FindTabHelper::StartFinding(base::string16 search_string,
bool find_next = (find_text_ == search_string || search_string.empty()) &&
(last_search_case_sensitive_ == case_sensitive) &&
!find_op_aborted_;
- if (!find_next)
- current_find_request_id_ = find_request_id_counter_++;
+
+ current_find_request_id_ = find_request_id_counter_++;
if (!search_string.empty())
find_text_ = search_string;
@@ -141,14 +141,13 @@ void FindTabHelper::ActivateFindInPageResultForAccessibility() {
#if defined(OS_ANDROID)
void FindTabHelper::ActivateNearestFindResult(float x, float y) {
if (!find_op_aborted_ && !find_text_.empty()) {
- web_contents()->GetMainFrame()->ActivateNearestFindResult(
- current_find_request_id_, x, y);
+ web_contents()->ActivateNearestFindResult(x, y);
}
}
void FindTabHelper::RequestFindMatchRects(int current_version) {
if (!find_op_aborted_ && !find_text_.empty())
- web_contents()->GetMainFrame()->RequestFindMatchRects(current_version);
+ web_contents()->RequestFindMatchRects(current_version);
}
#endif
« no previous file with comments | « android_webview/browser/find_helper.cc ('k') | content/browser/find_request_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698