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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
454 entry, // entry | 454 entry, // entry |
455 frame_entry, // frame_entry | 455 frame_entry, // frame_entry |
456 is_same_document_history_load); // is_same_document_history_load | 456 is_same_document_history_load); // is_same_document_history_load |
457 | 457 |
458 dest_render_frame_host->Navigate( | 458 dest_render_frame_host->Navigate( |
459 entry.ConstructCommonNavigationParams( | 459 entry.ConstructCommonNavigationParams( |
460 frame_entry, post_body, dest_url, dest_referrer, navigation_type, | 460 frame_entry, post_body, dest_url, dest_referrer, navigation_type, |
461 previews_state, navigation_start), | 461 previews_state, navigation_start), |
462 entry.ConstructStartNavigationParams(), | 462 entry.ConstructStartNavigationParams(), |
463 entry.ConstructRequestNavigationParams( | 463 entry.ConstructRequestNavigationParams( |
464 frame_entry, is_history_navigation_in_new_child, | 464 frame_entry, GURL(), std::string(), |
nasko
2017/02/10 23:53:09
Shouldn't this be dest_url and the actual method?
clamy
2017/02/13 14:29:37
I marked this parameter as PlzNavigate only, hence
nasko
2017/02/14 17:25:02
Acknowledged.
| |
465 is_history_navigation_in_new_child, | |
465 entry.GetSubframeUniqueNames(frame_tree_node), | 466 entry.GetSubframeUniqueNames(frame_tree_node), |
466 frame_tree_node->has_committed_real_load(), | 467 frame_tree_node->has_committed_real_load(), |
467 controller_->GetPendingEntryIndex() == -1, | 468 controller_->GetPendingEntryIndex() == -1, |
468 controller_->GetIndexOfEntry(&entry), | 469 controller_->GetIndexOfEntry(&entry), |
469 controller_->GetLastCommittedEntryIndex(), | 470 controller_->GetLastCommittedEntryIndex(), |
470 controller_->GetEntryCount())); | 471 controller_->GetEntryCount())); |
471 } else { | 472 } else { |
472 dest_render_frame_host->navigation_handle()->set_is_transferring(false); | 473 dest_render_frame_host->navigation_handle()->set_is_transferring(false); |
473 } | 474 } |
474 } | 475 } |
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1321 if (navigation_handle) | 1322 if (navigation_handle) |
1322 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); | 1323 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); |
1323 | 1324 |
1324 controller_->SetPendingEntry(std::move(entry)); | 1325 controller_->SetPendingEntry(std::move(entry)); |
1325 if (delegate_) | 1326 if (delegate_) |
1326 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 1327 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
1327 } | 1328 } |
1328 } | 1329 } |
1329 | 1330 |
1330 } // namespace content | 1331 } // namespace content |
OLD | NEW |