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

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

Issue 379143002: PlzNavigate: implement RequestNavigation in the no live renderer case (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed speculative rfh + no pending_navigation_entry dependency Created 6 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/navigation_request.h" 5 #include "content/browser/frame_host/navigation_request.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "content/browser/loader/resource_dispatcher_host_impl.h" 8 #include "content/browser/loader/resource_dispatcher_host_impl.h"
9 #include "content/common/resource_request_body.h" 9 #include "content/common/resource_request_body.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 11
12 namespace content { 12 namespace content {
13 13
14 namespace { 14 namespace {
15 15
16 void OnBeginNavigation(const NavigationRequestInfo& info, 16 void OnBeginNavigation(const NavigationRequestInfo& info,
17 scoped_refptr<ResourceRequestBody> request_body, 17 scoped_refptr<ResourceRequestBody> request_body,
18 int64 frame_node_id) { 18 int64 frame_node_id) {
19 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 19 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
20 ResourceDispatcherHostImpl::Get()->NavigationRequest( 20 ResourceDispatcherHostImpl::Get()->NavigationRequest(
21 info, request_body, frame_node_id); 21 info, request_body, frame_node_id);
22 } 22 }
23 23
24 } // namespace 24 } // namespace
25 25
26 NavigationRequest::NavigationRequest(const NavigationRequestInfo& info, 26 NavigationRequest::NavigationRequest(const NavigationRequestInfo& info,
27 const NavigationEntryImpl& entry,
27 int64 frame_node_id) 28 int64 frame_node_id)
28 : info_(info), 29 : info_(info),
30 entry_(entry),
29 frame_node_id_(frame_node_id) { 31 frame_node_id_(frame_node_id) {
30 } 32 }
31 33
32 NavigationRequest::~NavigationRequest() { 34 NavigationRequest::~NavigationRequest() {
33 // TODO(clamy): Cancel the corresponding request in ResourceDispatcherHost if 35 // TODO(clamy): Cancel the corresponding request in ResourceDispatcherHost if
34 // it has not commited yet. 36 // it has not commited yet.
35 } 37 }
36 38
37 void NavigationRequest::BeginNavigation( 39 void NavigationRequest::BeginNavigation(
38 scoped_refptr<ResourceRequestBody> request_body) { 40 scoped_refptr<ResourceRequestBody> request_body) {
39 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
40 BrowserThread::PostTask( 42 BrowserThread::PostTask(
41 BrowserThread::IO, 43 BrowserThread::IO,
42 FROM_HERE, 44 FROM_HERE,
43 base::Bind(&OnBeginNavigation, info_, request_body, frame_node_id_)); 45 base::Bind(&OnBeginNavigation, info_, request_body, frame_node_id_));
44 } 46 }
45 47
48 void NavigationRequest::UpdateEntryForCommit(const GURL& final_url) {
49 entry_.SetURL(final_url);
50 }
51
46 } // namespace content 52 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698