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

Side by Side Diff: content/browser/renderer_host/render_view_host_impl.cc

Issue 10905058: Upstream the Android port find-in-page feature. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nit fixes. Created 8 years, 3 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 | Annotate | Revision Log
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 "content/browser/renderer_host/render_view_host_impl.h" 5 #include "content/browser/renderer_host/render_view_host_impl.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 int request_id) { 485 int request_id) {
486 CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest( 486 CrossSiteRequestManager::GetInstance()->SetHasPendingCrossSiteRequest(
487 GetProcess()->GetID(), GetRoutingID(), has_pending_request); 487 GetProcess()->GetID(), GetRoutingID(), has_pending_request);
488 pending_request_id_ = request_id; 488 pending_request_id_ = request_id;
489 } 489 }
490 490
491 int RenderViewHostImpl::GetPendingRequestId() { 491 int RenderViewHostImpl::GetPendingRequestId() {
492 return pending_request_id_; 492 return pending_request_id_;
493 } 493 }
494 494
495 #if defined(OS_ANDROID)
496 void RenderViewHostImpl::ActivateNearestFindResult(int request_id,
497 float x,
498 float y) {
499 Send(new ViewMsg_ActivateNearestFindResult(GetRoutingID(), request_id, x, y));
500 }
501
502 void RenderViewHostImpl::RequestFindMatchRects(int current_version) {
503 Send(new ViewMsg_FindMatchRects(GetRoutingID(), current_version));
504 }
505 #endif
506
495 void RenderViewHostImpl::DragTargetDragEnter( 507 void RenderViewHostImpl::DragTargetDragEnter(
496 const WebDropData& drop_data, 508 const WebDropData& drop_data,
497 const gfx::Point& client_pt, 509 const gfx::Point& client_pt,
498 const gfx::Point& screen_pt, 510 const gfx::Point& screen_pt,
499 WebDragOperationsMask operations_allowed, 511 WebDragOperationsMask operations_allowed,
500 int key_modifiers) { 512 int key_modifiers) {
501 const int renderer_id = GetProcess()->GetID(); 513 const int renderer_id = GetProcess()->GetID();
502 ChildProcessSecurityPolicyImpl* policy = 514 ChildProcessSecurityPolicyImpl* policy =
503 ChildProcessSecurityPolicyImpl::GetInstance(); 515 ChildProcessSecurityPolicyImpl::GetInstance();
504 516
(...skipping 1388 matching lines...) Expand 10 before | Expand all | Expand 10 after
1893 // can cause navigations to be ignored in OnMsgNavigate. 1905 // can cause navigations to be ignored in OnMsgNavigate.
1894 is_waiting_for_beforeunload_ack_ = false; 1906 is_waiting_for_beforeunload_ack_ = false;
1895 is_waiting_for_unload_ack_ = false; 1907 is_waiting_for_unload_ack_ = false;
1896 } 1908 }
1897 1909
1898 void RenderViewHostImpl::ClearPowerSaveBlockers() { 1910 void RenderViewHostImpl::ClearPowerSaveBlockers() {
1899 STLDeleteValues(&power_save_blockers_); 1911 STLDeleteValues(&power_save_blockers_);
1900 } 1912 }
1901 1913
1902 } // namespace content 1914 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_view_host_impl.h ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698