| 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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 entry.ConstructStartNavigationParams(), | 428 entry.ConstructStartNavigationParams(), |
| 429 entry.ConstructRequestNavigationParams( | 429 entry.ConstructRequestNavigationParams( |
| 430 frame_entry, is_same_document_history_load, | 430 frame_entry, is_same_document_history_load, |
| 431 is_history_navigation_in_new_child, | 431 is_history_navigation_in_new_child, |
| 432 entry.GetSubframeUniqueNames(frame_tree_node), | 432 entry.GetSubframeUniqueNames(frame_tree_node), |
| 433 frame_tree_node->has_committed_real_load(), | 433 frame_tree_node->has_committed_real_load(), |
| 434 controller_->GetPendingEntryIndex() == -1, | 434 controller_->GetPendingEntryIndex() == -1, |
| 435 controller_->GetIndexOfEntry(&entry), | 435 controller_->GetIndexOfEntry(&entry), |
| 436 controller_->GetLastCommittedEntryIndex(), | 436 controller_->GetLastCommittedEntryIndex(), |
| 437 controller_->GetEntryCount())); | 437 controller_->GetEntryCount())); |
| 438 } else { |
| 439 dest_render_frame_host->navigation_handle()->set_is_transferring(false); |
| 438 } | 440 } |
| 439 } | 441 } |
| 440 | 442 |
| 441 // Make sure no code called via RFH::Navigate clears the pending entry. | 443 // Make sure no code called via RFH::Navigate clears the pending entry. |
| 442 if (is_pending_entry) | 444 if (is_pending_entry) |
| 443 CHECK_EQ(controller_->GetPendingEntry(), &entry); | 445 CHECK_EQ(controller_->GetPendingEntry(), &entry); |
| 444 | 446 |
| 445 if (controller_->GetPendingEntryIndex() == -1 && | 447 if (controller_->GetPendingEntryIndex() == -1 && |
| 446 dest_url.SchemeIs(url::kJavaScriptScheme)) { | 448 dest_url.SchemeIs(url::kJavaScriptScheme)) { |
| 447 // If the pending entry index is -1 (which means a new navigation rather | 449 // If the pending entry index is -1 (which means a new navigation rather |
| (...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1264 if (navigation_handle) | 1266 if (navigation_handle) |
| 1265 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); | 1267 navigation_handle->update_entry_id_for_transfer(entry->GetUniqueID()); |
| 1266 | 1268 |
| 1267 controller_->SetPendingEntry(std::move(entry)); | 1269 controller_->SetPendingEntry(std::move(entry)); |
| 1268 if (delegate_) | 1270 if (delegate_) |
| 1269 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); | 1271 delegate_->NotifyChangedNavigationState(content::INVALIDATE_TYPE_URL); |
| 1270 } | 1272 } |
| 1271 } | 1273 } |
| 1272 | 1274 |
| 1273 } // namespace content | 1275 } // namespace content |
| OLD | NEW |