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

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

Issue 483773002: PlzNavigate: implement CommitNavigation on the browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added a class to keep track of navigation parameters Created 6 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
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 1198 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 render_view_host_->delegate_->RendererUnresponsive( 1209 render_view_host_->delegate_->RendererUnresponsive(
1210 render_view_host_, 1210 render_view_host_,
1211 render_view_host_->is_waiting_for_beforeunload_ack(), 1211 render_view_host_->is_waiting_for_beforeunload_ack(),
1212 render_view_host_->IsWaitingForUnloadACK()); 1212 render_view_host_->IsWaitingForUnloadACK());
1213 } 1213 }
1214 1214
1215 void RenderFrameHostImpl::NotificationClosed(int notification_id) { 1215 void RenderFrameHostImpl::NotificationClosed(int notification_id) {
1216 cancel_notification_callbacks_.erase(notification_id); 1216 cancel_notification_callbacks_.erase(notification_id);
1217 } 1217 }
1218 1218
1219 // PlzNavigate
1220 void RenderFrameHostImpl::CommitNavigation(
1221 const FrameMsg_CommitNavigation_Params& params) {
1222 // TODO(clamy): Check if we have to add security checks for the browser plugin
1223 // guests.
1224
1225 DCHECK(render_view_host_->rvh_state() == RenderViewHostImpl::STATE_DEFAULT);
1226 // Get back to a clean state, in case we start a new navigation without
1227 // completing a RVH swap or unload handler.
1228 render_view_host_->SetState(RenderViewHostImpl::STATE_DEFAULT);
1229 Send(new FrameMsg_CommitNavigation(routing_id_, params));
1230 // TODO(clamy): Check if we have to be concerned about throbbing javascript
1231 // urls.
1232 }
1233
1219 void RenderFrameHostImpl::PlatformNotificationPermissionRequestDone( 1234 void RenderFrameHostImpl::PlatformNotificationPermissionRequestDone(
1220 int request_id, blink::WebNotificationPermission permission) { 1235 int request_id, blink::WebNotificationPermission permission) {
1221 Send(new PlatformNotificationMsg_PermissionRequestComplete( 1236 Send(new PlatformNotificationMsg_PermissionRequestComplete(
1222 routing_id_, request_id, permission)); 1237 routing_id_, request_id, permission));
1223 } 1238 }
1224 1239
1225 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) { 1240 void RenderFrameHostImpl::SetAccessibilityMode(AccessibilityMode mode) {
1226 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode)); 1241 Send(new FrameMsg_SetAccessibilityMode(routing_id_, mode));
1227 } 1242 }
1228 1243
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
1329 // Clear any state if a pending navigation is canceled or preempted. 1344 // Clear any state if a pending navigation is canceled or preempted.
1330 if (suspended_nav_params_) 1345 if (suspended_nav_params_)
1331 suspended_nav_params_.reset(); 1346 suspended_nav_params_.reset();
1332 1347
1333 TRACE_EVENT_ASYNC_END0("navigation", 1348 TRACE_EVENT_ASYNC_END0("navigation",
1334 "RenderFrameHostImpl navigation suspended", this); 1349 "RenderFrameHostImpl navigation suspended", this);
1335 navigations_suspended_ = false; 1350 navigations_suspended_ = false;
1336 } 1351 }
1337 1352
1338 } // namespace content 1353 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698