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

Side by Side Diff: content/browser/find_request_manager.cc

Issue 1913543002: Fix for problem with activating find-in-page match via find tickbar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "content/browser/find_request_manager.h" 5 #include "content/browser/find_request_manager.h"
6 6
7 #include "content/browser/frame_host/render_frame_host_impl.h" 7 #include "content/browser/frame_host/render_frame_host_impl.h"
8 #include "content/browser/web_contents/web_contents_impl.h" 8 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/common/frame_messages.h" 9 #include "content/common/frame_messages.h"
10 #include "content/common/input_messages.h" 10 #include "content/common/input_messages.h"
(...skipping 22 matching lines...) Expand all
33 33
34 FindRequest request(request_id, search_text, options); 34 FindRequest request(request_id, search_text, options);
35 35
36 if (options.findNext) { 36 if (options.findNext) {
37 // This is a find next operation. 37 // This is a find next operation.
38 38
39 // This implies that there is an ongoing find session with the same search 39 // This implies that there is an ongoing find session with the same search
40 // text. 40 // text.
41 DCHECK_GE(current_session_id_, 0); 41 DCHECK_GE(current_session_id_, 0);
42 DCHECK_EQ(request.search_text, current_request_.search_text); 42 DCHECK_EQ(request.search_text, current_request_.search_text);
43
44 current_request_ = request;
43 } else { 45 } else {
44 // This is an initial find operation. 46 // This is an initial find operation.
45 Reset(request); 47 Reset(request);
46 } 48 }
47 49
48 SendFindIPC(request, contents_->GetMainFrame()); 50 SendFindIPC(request, contents_->GetMainFrame());
49 } 51 }
50 52
51 void FindRequestManager::StopFinding(StopFindAction action) { 53 void FindRequestManager::StopFinding(StopFindAction action) {
52 SendStopFindingIPC(action, contents_->GetMainFrame()); 54 SendStopFindingIPC(action, contents_->GetMainFrame());
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 } 132 }
131 133
132 #if defined(OS_ANDROID) 134 #if defined(OS_ANDROID)
133 void FindRequestManager::SendFindMatchRectsIPC(RenderFrameHost* rfh) { 135 void FindRequestManager::SendFindMatchRectsIPC(RenderFrameHost* rfh) {
134 rfh->Send(new FrameMsg_FindMatchRects(rfh->GetRoutingID(), 136 rfh->Send(new FrameMsg_FindMatchRects(rfh->GetRoutingID(),
135 match_rects_.request_version)); 137 match_rects_.request_version));
136 } 138 }
137 #endif 139 #endif
138 140
139 } // namespace content 141 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698