| 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/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 is_transfer && | 368 is_transfer && |
| 369 entry.transferred_global_request_id().child_id == | 369 entry.transferred_global_request_id().child_id == |
| 370 dest_render_frame_host->GetProcess()->GetID(); | 370 dest_render_frame_host->GetProcess()->GetID(); |
| 371 if (!is_transfer_to_same) { | 371 if (!is_transfer_to_same) { |
| 372 navigation_data_.reset(new NavigationMetricsData( | 372 navigation_data_.reset(new NavigationMetricsData( |
| 373 navigation_start, dest_url, entry.restore_type())); | 373 navigation_start, dest_url, entry.restore_type())); |
| 374 // Create the navigation parameters. | 374 // Create the navigation parameters. |
| 375 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType( | 375 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType( |
| 376 controller_->GetBrowserContext(), entry, reload_type); | 376 controller_->GetBrowserContext(), entry, reload_type); |
| 377 dest_render_frame_host->Navigate( | 377 dest_render_frame_host->Navigate( |
| 378 entry.ConstructCommonNavigationParams(dest_url, dest_referrer, | 378 entry.ConstructCommonNavigationParams(frame_entry, dest_url, |
| 379 navigation_type, lofi_state, | 379 dest_referrer, navigation_type, |
| 380 navigation_start), | 380 lofi_state, navigation_start), |
| 381 entry.ConstructStartNavigationParams(), | 381 entry.ConstructStartNavigationParams(), |
| 382 entry.ConstructRequestNavigationParams( | 382 entry.ConstructRequestNavigationParams( |
| 383 frame_entry, is_same_document_history_load, | 383 frame_entry, is_same_document_history_load, |
| 384 frame_tree_node->has_committed_real_load(), | 384 frame_tree_node->has_committed_real_load(), |
| 385 controller_->GetPendingEntryIndex() == -1, | 385 controller_->GetPendingEntryIndex() == -1, |
| 386 controller_->GetIndexOfEntry(&entry), | 386 controller_->GetIndexOfEntry(&entry), |
| 387 controller_->GetLastCommittedEntryIndex(), | 387 controller_->GetLastCommittedEntryIndex(), |
| 388 controller_->GetEntryCount())); | 388 controller_->GetEntryCount())); |
| 389 } else { | 389 } else { |
| 390 // No need to navigate again. Just resume the deferred request. | 390 // No need to navigate again. Just resume the deferred request. |
| (...skipping 756 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1147 if (pending_entry != controller_->GetVisibleEntry() || | 1147 if (pending_entry != controller_->GetVisibleEntry() || |
| 1148 !should_preserve_entry) { | 1148 !should_preserve_entry) { |
| 1149 controller_->DiscardPendingEntry(true); | 1149 controller_->DiscardPendingEntry(true); |
| 1150 | 1150 |
| 1151 // Also force the UI to refresh. | 1151 // Also force the UI to refresh. |
| 1152 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 1152 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
| 1153 } | 1153 } |
| 1154 } | 1154 } |
| 1155 | 1155 |
| 1156 } // namespace content | 1156 } // namespace content |
| OLD | NEW |