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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 914223002: PlzNavigate: Updated navigation cancel policy for renderer-initiated requests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes from CR comments. Created 5 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/containers/hash_tables.h" 9 #include "base/containers/hash_tables.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 // mirroring works correctly, add a check here to enforce it. 1204 // mirroring works correctly, add a check here to enforce it.
1205 delegate_->UpdateEncoding(this, encoding_name); 1205 delegate_->UpdateEncoding(this, encoding_name);
1206 } 1206 }
1207 1207
1208 void RenderFrameHostImpl::OnBeginNavigation( 1208 void RenderFrameHostImpl::OnBeginNavigation(
1209 const CommonNavigationParams& common_params, 1209 const CommonNavigationParams& common_params,
1210 const BeginNavigationParams& begin_params, 1210 const BeginNavigationParams& begin_params,
1211 scoped_refptr<ResourceRequestBody> body) { 1211 scoped_refptr<ResourceRequestBody> body) {
1212 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch( 1212 CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
1213 switches::kEnableBrowserSideNavigation)); 1213 switches::kEnableBrowserSideNavigation));
1214 frame_tree_node()->navigator()->OnBeginNavigation( 1214 frame_tree_node()->navigator()->RendererInitiatedNavigationRequest(
1215 frame_tree_node(), common_params, begin_params, body); 1215 frame_tree_node(), common_params, begin_params, body);
1216 } 1216 }
1217 1217
1218 void RenderFrameHostImpl::OnAccessibilityEvents( 1218 void RenderFrameHostImpl::OnAccessibilityEvents(
1219 const std::vector<AccessibilityHostMsg_EventParams>& params, 1219 const std::vector<AccessibilityHostMsg_EventParams>& params,
1220 int reset_token) { 1220 int reset_token) {
1221 // Don't process this IPC if either we're waiting on a reset and this 1221 // Don't process this IPC if either we're waiting on a reset and this
1222 // IPC doesn't have the matching token ID, or if we're not waiting on a 1222 // IPC doesn't have the matching token ID, or if we're not waiting on a
1223 // reset but this message includes a reset token. 1223 // reset but this message includes a reset token.
1224 if (accessibility_reset_token_ != reset_token) { 1224 if (accessibility_reset_token_ != reset_token) {
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
1886 void RenderFrameHostImpl::DidUseGeolocationPermission() { 1886 void RenderFrameHostImpl::DidUseGeolocationPermission() {
1887 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame(); 1887 RenderFrameHost* top_frame = frame_tree_node()->frame_tree()->GetMainFrame();
1888 GetContentClient()->browser()->RegisterPermissionUsage( 1888 GetContentClient()->browser()->RegisterPermissionUsage(
1889 PERMISSION_GEOLOCATION, 1889 PERMISSION_GEOLOCATION,
1890 delegate_->GetAsWebContents(), 1890 delegate_->GetAsWebContents(),
1891 GetLastCommittedURL().GetOrigin(), 1891 GetLastCommittedURL().GetOrigin(),
1892 top_frame->GetLastCommittedURL().GetOrigin()); 1892 top_frame->GetLastCommittedURL().GetOrigin());
1893 } 1893 }
1894 1894
1895 } // namespace content 1895 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698