Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(549)

Unified Diff: content/browser/frame_host/navigation_entry_impl.cc

Issue 1432583002: Move browser_navigation_start to CommonNavigationParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nasko review Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.h ('k') | content/browser/frame_host/navigation_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/frame_host/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index dd571d497a546d760faf4493570e7fb5c25c1c36..a1f47a99dacc9cb5b783302b1c70b25cd8eeb2f3 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -455,7 +455,8 @@ CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
const Referrer& dest_referrer,
const FrameNavigationEntry& frame_entry,
FrameMsg_Navigate_Type::Value navigation_type,
- LoFiState lofi_state) const {
+ LoFiState lofi_state,
+ const base::TimeTicks& navigation_start) const {
FrameMsg_UILoadMetricsReportType::Value report_type =
FrameMsg_UILoadMetricsReportType::NO_REPORT;
base::TimeTicks ui_timestamp = base::TimeTicks();
@@ -468,7 +469,8 @@ CommonNavigationParams NavigationEntryImpl::ConstructCommonNavigationParams(
return CommonNavigationParams(
dest_url, dest_referrer, GetTransitionType(), navigation_type,
!IsViewSourceMode(), should_replace_entry(), ui_timestamp, report_type,
- GetBaseURLForDataURL(), GetHistoryURLForDataURL(), lofi_state);
+ GetBaseURLForDataURL(), GetHistoryURLForDataURL(), lofi_state,
+ navigation_start);
}
StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()
@@ -492,7 +494,6 @@ StartNavigationParams NavigationEntryImpl::ConstructStartNavigationParams()
RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(
const FrameNavigationEntry& frame_entry,
- base::TimeTicks navigation_start,
bool is_same_document_history_load,
bool has_committed_real_load,
bool intended_as_new_entry,
@@ -518,12 +519,11 @@ RequestNavigationParams NavigationEntryImpl::ConstructRequestNavigationParams(
current_length_to_send = 0;
}
return RequestNavigationParams(
- GetIsOverridingUserAgent(), navigation_start, redirects,
- GetCanLoadLocalResources(), base::Time::Now(), frame_entry.page_state(),
- GetPageID(), GetUniqueID(), is_same_document_history_load,
- has_committed_real_load, intended_as_new_entry, pending_offset_to_send,
- current_offset_to_send, current_length_to_send,
- should_clear_history_list());
+ GetIsOverridingUserAgent(), redirects, GetCanLoadLocalResources(),
+ base::Time::Now(), frame_entry.page_state(), GetPageID(), GetUniqueID(),
+ is_same_document_history_load, has_committed_real_load,
+ intended_as_new_entry, pending_offset_to_send, current_offset_to_send,
+ current_length_to_send, should_clear_history_list());
}
void NavigationEntryImpl::ResetForCommit() {
« no previous file with comments | « content/browser/frame_host/navigation_entry_impl.h ('k') | content/browser/frame_host/navigation_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698