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_controller_impl.h

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: content/browser/frame_host/navigation_controller_impl.h
diff --git a/content/browser/frame_host/navigation_controller_impl.h b/content/browser/frame_host/navigation_controller_impl.h
index a646646f35f87d2fcf0577b33773260ca78cdca5..ff99a2727a50d739f46a5a4b1448de553e7082f7 100644
--- a/content/browser/frame_host/navigation_controller_impl.h
+++ b/content/browser/frame_host/navigation_controller_impl.h
@@ -135,6 +135,7 @@ class CONTENT_EXPORT NavigationControllerImpl
// and it will return false.
bool RendererDidNavigate(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
LoadCommittedDetails* details);
@@ -229,6 +230,7 @@ class CONTENT_EXPORT NavigationControllerImpl
// Classifies the given renderer navigation (see the NavigationType enum).
NavigationType ClassifyNavigation(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const;
// Causes the controller to load the specified entry. The function assumes
@@ -250,23 +252,29 @@ class CONTENT_EXPORT NavigationControllerImpl
// See LoadCommittedDetails.did_replace_entry.
void RendererDidNavigateToNewPage(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
bool replace_entry);
void RendererDidNavigateToExistingPage(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
void RendererDidNavigateToSamePage(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
void RendererDidNavigateInPage(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
bool* did_replace_entry);
void RendererDidNavigateNewSubframe(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
bool RendererDidNavigateAutoSubframe(
RenderFrameHost* rfh,
+ int32 page_id,
const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
// Helper function for code shared between Reload() and ReloadIgnoringCache().

Powered by Google App Engine
This is Rietveld 408576698