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

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

Issue 1255573005: Create FrameNavigationEntries for the initial blank page in subframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update comments Created 5 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 "content/browser/frame_host/frame_tree.h" 7 #include "content/browser/frame_host/frame_tree.h"
8 #include "content/browser/frame_host/frame_tree_node.h" 8 #include "content/browser/frame_host/frame_tree_node.h"
9 #include "content/browser/frame_host/navigation_controller_impl.h" 9 #include "content/browser/frame_host/navigation_controller_impl.h"
10 #include "content/browser/frame_host/navigation_request_info.h" 10 #include "content/browser/frame_host/navigation_request_info.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 } 83 }
84 84
85 scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest( 85 scoped_ptr<NavigationRequest> navigation_request(new NavigationRequest(
86 frame_tree_node, 86 frame_tree_node,
87 entry.ConstructCommonNavigationParams(dest_url, dest_referrer, 87 entry.ConstructCommonNavigationParams(dest_url, dest_referrer,
88 frame_entry, navigation_type), 88 frame_entry, navigation_type),
89 BeginNavigationParams(method, headers.ToString(), 89 BeginNavigationParams(method, headers.ToString(),
90 LoadFlagFromNavigationType(navigation_type), false), 90 LoadFlagFromNavigationType(navigation_type), false),
91 entry.ConstructRequestNavigationParams( 91 entry.ConstructRequestNavigationParams(
92 frame_entry, navigation_start, is_same_document_history_load, 92 frame_entry, navigation_start, is_same_document_history_load,
93 controller->HasCommittedRealLoad(frame_tree_node), 93 frame_tree_node->has_committed_real_load(),
94 controller->GetPendingEntryIndex() == -1, 94 controller->GetPendingEntryIndex() == -1,
95 controller->GetIndexOfEntry(&entry), 95 controller->GetIndexOfEntry(&entry),
96 controller->GetLastCommittedEntryIndex(), 96 controller->GetLastCommittedEntryIndex(),
97 controller->GetEntryCount()), 97 controller->GetEntryCount()),
98 request_body, true, &frame_entry, &entry)); 98 request_body, true, &frame_entry, &entry));
99 return navigation_request.Pass(); 99 return navigation_request.Pass();
100 } 100 }
101 101
102 // static 102 // static
103 scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated( 103 scoped_ptr<NavigationRequest> NavigationRequest::CreateRendererInitiated(
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 frame_tree_node_->navigator()->FailedNavigation( 223 frame_tree_node_->navigator()->FailedNavigation(
224 frame_tree_node_, has_stale_copy_in_cache, net_error); 224 frame_tree_node_, has_stale_copy_in_cache, net_error);
225 } 225 }
226 226
227 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) { 227 void NavigationRequest::OnRequestStarted(base::TimeTicks timestamp) {
228 frame_tree_node_->navigator()->LogResourceRequestTime(timestamp, 228 frame_tree_node_->navigator()->LogResourceRequestTime(timestamp,
229 common_params_.url); 229 common_params_.url);
230 } 230 }
231 231
232 } // namespace content 232 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.cc ('k') | content/browser/frame_host/navigator_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698