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

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

Issue 2380943002: Tell renderer which subframes have history items on back/forward. (Closed)
Patch Set: Fix const ref. Created 4 years, 2 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 <utility> 7 #include <utility>
8 8
9 #include "content/browser/devtools/render_frame_devtools_agent_host.h" 9 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
10 #include "content/browser/frame_host/frame_tree.h" 10 #include "content/browser/frame_host/frame_tree.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 frame_tree_node, entry.ConstructCommonNavigationParams( 148 frame_tree_node, entry.ConstructCommonNavigationParams(
149 frame_entry, request_body, dest_url, dest_referrer, 149 frame_entry, request_body, dest_url, dest_referrer,
150 navigation_type, lofi_state, navigation_start), 150 navigation_type, lofi_state, navigation_start),
151 BeginNavigationParams(entry.extra_headers(), net::LOAD_NORMAL, 151 BeginNavigationParams(entry.extra_headers(), net::LOAD_NORMAL,
152 false, // has_user_gestures 152 false, // has_user_gestures
153 false, // skip_service_worker 153 false, // skip_service_worker
154 REQUEST_CONTEXT_TYPE_LOCATION), 154 REQUEST_CONTEXT_TYPE_LOCATION),
155 entry.ConstructRequestNavigationParams( 155 entry.ConstructRequestNavigationParams(
156 frame_entry, is_same_document_history_load, 156 frame_entry, is_same_document_history_load,
157 is_history_navigation_in_new_child, 157 is_history_navigation_in_new_child,
158 entry.HasSubtreeHistoryItems(frame_tree_node), 158 entry.GetSubframeUniqueNames(frame_tree_node),
159 frame_tree_node->has_committed_real_load(), 159 frame_tree_node->has_committed_real_load(),
160 controller->GetPendingEntryIndex() == -1, 160 controller->GetPendingEntryIndex() == -1,
161 controller->GetIndexOfEntry(&entry), 161 controller->GetIndexOfEntry(&entry),
162 controller->GetLastCommittedEntryIndex(), 162 controller->GetLastCommittedEntryIndex(),
163 controller->GetEntryCount()), 163 controller->GetEntryCount()),
164 true, &frame_entry, &entry)); 164 true, &frame_entry, &entry));
165 return navigation_request; 165 return navigation_request;
166 } 166 }
167 167
168 // static 168 // static
(...skipping 12 matching lines...) Expand all
181 RequestNavigationParams request_params( 181 RequestNavigationParams request_params(
182 false, // is_overriding_user_agent 182 false, // is_overriding_user_agent
183 std::vector<GURL>(), // redirects 183 std::vector<GURL>(), // redirects
184 false, // can_load_local_resources 184 false, // can_load_local_resources
185 base::Time::Now(), // request_time 185 base::Time::Now(), // request_time
186 PageState(), // page_state 186 PageState(), // page_state
187 -1, // page_id 187 -1, // page_id
188 0, // nav_entry_id 188 0, // nav_entry_id
189 false, // is_same_document_history_load 189 false, // is_same_document_history_load
190 false, // is_history_navigation_in_new_child 190 false, // is_history_navigation_in_new_child
191 false, // has_subtree_history_items 191 std::set<std::string>(), // subframe_unique_names
192 frame_tree_node->has_committed_real_load(), 192 frame_tree_node->has_committed_real_load(),
193 false, // intended_as_new_entry 193 false, // intended_as_new_entry
194 -1, // pending_history_list_offset 194 -1, // pending_history_list_offset
195 current_history_list_offset, current_history_list_length, 195 current_history_list_offset, current_history_list_length,
196 false, // is_view_source 196 false, // is_view_source
197 false); // should_clear_history_list 197 false); // should_clear_history_list
198 std::unique_ptr<NavigationRequest> navigation_request( 198 std::unique_ptr<NavigationRequest> navigation_request(
199 new NavigationRequest(frame_tree_node, common_params, begin_params, 199 new NavigationRequest(frame_tree_node, common_params, begin_params,
200 request_params, false, nullptr, nullptr)); 200 request_params, false, nullptr, nullptr));
201 return navigation_request; 201 return navigation_request;
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 545
546 TransferNavigationHandleOwnership(render_frame_host); 546 TransferNavigationHandleOwnership(render_frame_host);
547 render_frame_host->CommitNavigation(response_.get(), std::move(body_), 547 render_frame_host->CommitNavigation(response_.get(), std::move(body_),
548 common_params_, request_params_, 548 common_params_, request_params_,
549 is_view_source_); 549 is_view_source_);
550 550
551 frame_tree_node_->ResetNavigationRequest(true); 551 frame_tree_node_->ResetNavigationRequest(true);
552 } 552 }
553 553
554 } // namespace content 554 } // 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