OLD | NEW |
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/navigator_impl.h" | 5 #include "content/browser/frame_host/navigator_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/metrics/histogram_macros.h" | 10 #include "base/metrics/histogram_macros.h" |
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
448 entry, // entry | 448 entry, // entry |
449 frame_entry, // frame_entry | 449 frame_entry, // frame_entry |
450 is_same_document_history_load); // is_same_document_history_load | 450 is_same_document_history_load); // is_same_document_history_load |
451 | 451 |
452 dest_render_frame_host->Navigate( | 452 dest_render_frame_host->Navigate( |
453 entry.ConstructCommonNavigationParams( | 453 entry.ConstructCommonNavigationParams( |
454 frame_entry, post_body, dest_url, dest_referrer, navigation_type, | 454 frame_entry, post_body, dest_url, dest_referrer, navigation_type, |
455 previews_state, navigation_start), | 455 previews_state, navigation_start), |
456 entry.ConstructStartNavigationParams(), | 456 entry.ConstructStartNavigationParams(), |
457 entry.ConstructRequestNavigationParams( | 457 entry.ConstructRequestNavigationParams( |
458 frame_entry, is_history_navigation_in_new_child, | 458 frame_entry, GURL(), std::string(), |
| 459 is_history_navigation_in_new_child, |
459 entry.GetSubframeUniqueNames(frame_tree_node), | 460 entry.GetSubframeUniqueNames(frame_tree_node), |
460 frame_tree_node->has_committed_real_load(), | 461 frame_tree_node->has_committed_real_load(), |
461 controller_->GetPendingEntryIndex() == -1, | 462 controller_->GetPendingEntryIndex() == -1, |
462 controller_->GetIndexOfEntry(&entry), | 463 controller_->GetIndexOfEntry(&entry), |
463 controller_->GetLastCommittedEntryIndex(), | 464 controller_->GetLastCommittedEntryIndex(), |
464 controller_->GetEntryCount())); | 465 controller_->GetEntryCount())); |
465 } else { | 466 } else { |
466 dest_render_frame_host->navigation_handle()->set_is_transferring(false); | 467 dest_render_frame_host->navigation_handle()->set_is_transferring(false); |
467 } | 468 } |
468 } | 469 } |
(...skipping 851 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1320 if (navigation_handle) | 1321 if (navigation_handle) |
1321 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); | 1322 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); |
1322 | 1323 |
1323 controller_->SetPendingEntry(std::move(entry)); | 1324 controller_->SetPendingEntry(std::move(entry)); |
1324 if (delegate_) | 1325 if (delegate_) |
1325 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 1326 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
1326 } | 1327 } |
1327 } | 1328 } |
1328 | 1329 |
1329 } // namespace content | 1330 } // namespace content |
OLD | NEW |