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

Unified Diff: chrome/browser/history/history_tab_helper.cc

Issue 556703004: Remove page id from FrameNavigateParams. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 6 years, 2 months 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
Index: chrome/browser/history/history_tab_helper.cc
diff --git a/chrome/browser/history/history_tab_helper.cc b/chrome/browser/history/history_tab_helper.cc
index 8a40bf4eeb3b5ddc3464d5ee9b7d9b1ce52b410f..c53508f8cd1aba03f2a20110d0799c833054c9cd 100644
--- a/chrome/browser/history/history_tab_helper.cc
+++ b/chrome/browser/history/history_tab_helper.cc
@@ -54,11 +54,12 @@ void HistoryTabHelper::UpdateHistoryPageTitle(const NavigationEntry& entry) {
history::HistoryAddPageArgs
HistoryTabHelper::CreateHistoryAddPageArgs(
const GURL& virtual_url,
+ int32 page_id,
base::Time timestamp,
bool did_replace_entry,
const content::FrameNavigateParams& params) {
history::HistoryAddPageArgs add_page_args(
- params.url, timestamp, web_contents(), params.page_id,
+ params.url, timestamp, web_contents(), page_id,
params.referrer.url, params.redirects, params.transition,
history::SOURCE_BROWSED, did_replace_entry);
if (ui::PageTransitionIsMainFrame(params.transition) &&
@@ -98,8 +99,11 @@ void HistoryTabHelper::DidNavigateAnyFrame(
// the WebContents' URL getter does.
const history::HistoryAddPageArgs& add_page_args =
CreateHistoryAddPageArgs(
- web_contents()->GetURL(), details.entry->GetTimestamp(),
- details.did_replace_entry, params);
+ web_contents()->GetURL(),
+ details.entry->GetPageID(),
+ details.entry->GetTimestamp(),
+ details.did_replace_entry,
+ params);
prerender::PrerenderManager* prerender_manager =
prerender::PrerenderManagerFactory::GetForProfile(
« no previous file with comments | « chrome/browser/history/history_tab_helper.h ('k') | chrome/browser/safe_browsing/client_side_detection_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698