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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 is_transfer && | 380 is_transfer && |
381 entry.transferred_global_request_id().child_id == | 381 entry.transferred_global_request_id().child_id == |
382 dest_render_frame_host->GetProcess()->GetID(); | 382 dest_render_frame_host->GetProcess()->GetID(); |
383 if (!is_transfer_to_same) { | 383 if (!is_transfer_to_same) { |
384 navigation_data_.reset(new NavigationMetricsData( | 384 navigation_data_.reset(new NavigationMetricsData( |
385 navigation_start, dest_url, entry.restore_type())); | 385 navigation_start, dest_url, entry.restore_type())); |
386 // Create the navigation parameters. | 386 // Create the navigation parameters. |
387 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType( | 387 FrameMsg_Navigate_Type::Value navigation_type = GetNavigationType( |
388 controller_->GetBrowserContext(), entry, reload_type); | 388 controller_->GetBrowserContext(), entry, reload_type); |
389 dest_render_frame_host->Navigate( | 389 dest_render_frame_host->Navigate( |
390 entry.ConstructCommonNavigationParams(dest_url, dest_referrer, | 390 entry.ConstructCommonNavigationParams(frame_entry, dest_url, |
391 navigation_type, lofi_state, | 391 dest_referrer, navigation_type, |
392 navigation_start), | 392 lofi_state, navigation_start), |
393 entry.ConstructStartNavigationParams(), | 393 entry.ConstructStartNavigationParams(), |
394 entry.ConstructRequestNavigationParams( | 394 entry.ConstructRequestNavigationParams( |
395 frame_entry, is_same_document_history_load, | 395 frame_entry, is_same_document_history_load, |
396 frame_tree_node->has_committed_real_load(), | 396 frame_tree_node->has_committed_real_load(), |
397 controller_->GetPendingEntryIndex() == -1, | 397 controller_->GetPendingEntryIndex() == -1, |
398 controller_->GetIndexOfEntry(&entry), | 398 controller_->GetIndexOfEntry(&entry), |
399 controller_->GetLastCommittedEntryIndex(), | 399 controller_->GetLastCommittedEntryIndex(), |
400 controller_->GetEntryCount())); | 400 controller_->GetEntryCount())); |
401 } else { | 401 } else { |
402 // No need to navigate again. Just resume the deferred request. | 402 // No need to navigate again. Just resume the deferred request. |
(...skipping 761 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1164 if (pending_entry != controller_->GetVisibleEntry() || | 1164 if (pending_entry != controller_->GetVisibleEntry() || |
1165 !should_preserve_entry) { | 1165 !should_preserve_entry) { |
1166 controller_->DiscardPendingEntry(true); | 1166 controller_->DiscardPendingEntry(true); |
1167 | 1167 |
1168 // Also force the UI to refresh. | 1168 // Also force the UI to refresh. |
1169 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 1169 controller_->delegate()->NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
1170 } | 1170 } |
1171 } | 1171 } |
1172 | 1172 |
1173 } // namespace content | 1173 } // namespace content |
OLD | NEW |