Index: content/browser/frame_host/navigation_controller_impl.cc |
diff --git a/content/browser/frame_host/navigation_controller_impl.cc b/content/browser/frame_host/navigation_controller_impl.cc |
index b4f4cf17c9e0c0811bae0c07e5f950d11b16030c..9b6f47ea9c11830704da31383191a31aa87097a0 100644 |
--- a/content/browser/frame_host/navigation_controller_impl.cc |
+++ b/content/browser/frame_host/navigation_controller_impl.cc |
@@ -20,6 +20,7 @@ |
#include "content/browser/frame_host/navigation_entry_screenshot_manager.h" |
#include "content/browser/renderer_host/render_view_host_impl.h" // Temporary |
#include "content/browser/site_instance_impl.h" |
+#include "content/common/frame_messages.h" |
#include "content/common/view_messages.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/content_browser_client.h" |
@@ -734,7 +735,7 @@ void NavigationControllerImpl::LoadURLWithParams(const LoadURLParams& params) { |
bool NavigationControllerImpl::RendererDidNavigate( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params, |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params, |
LoadCommittedDetails* details) { |
is_initial_navigation_ = false; |
@@ -851,7 +852,7 @@ bool NavigationControllerImpl::RendererDidNavigate( |
NavigationType NavigationControllerImpl::ClassifyNavigation( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params) const { |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const { |
if (params.page_id == -1) { |
// The renderer generates the page IDs, and so if it gives us the invalid |
// page ID (-1) we know it didn't actually navigate. This happens in a few |
@@ -986,7 +987,7 @@ NavigationType NavigationControllerImpl::ClassifyNavigation( |
void NavigationControllerImpl::RendererDidNavigateToNewPage( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params, |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params, |
bool replace_entry) { |
NavigationEntryImpl* new_entry; |
bool update_virtual_url; |
@@ -1050,7 +1051,7 @@ void NavigationControllerImpl::RendererDidNavigateToNewPage( |
void NavigationControllerImpl::RendererDidNavigateToExistingPage( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params) { |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { |
// We should only get here for main frame navigations. |
DCHECK(PageTransitionIsMainFrame(params.transition)); |
@@ -1103,7 +1104,7 @@ void NavigationControllerImpl::RendererDidNavigateToExistingPage( |
void NavigationControllerImpl::RendererDidNavigateToSamePage( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params) { |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { |
// This mode implies we have a pending entry that's the same as an existing |
// entry for this page ID. This entry is guaranteed to exist by |
// ClassifyNavigation. All we need to do is update the existing entry. |
@@ -1130,7 +1131,7 @@ void NavigationControllerImpl::RendererDidNavigateToSamePage( |
void NavigationControllerImpl::RendererDidNavigateInPage( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params, |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params, |
bool* did_replace_entry) { |
DCHECK(PageTransitionIsMainFrame(params.transition)) << |
"WebKit should only tell us about in-page navs for the main frame."; |
@@ -1159,7 +1160,7 @@ void NavigationControllerImpl::RendererDidNavigateInPage( |
void NavigationControllerImpl::RendererDidNavigateNewSubframe( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params) { |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { |
if (PageTransitionCoreTypeIs(params.transition, |
PAGE_TRANSITION_AUTO_SUBFRAME)) { |
// This is not user-initiated. Ignore. |
@@ -1181,7 +1182,7 @@ void NavigationControllerImpl::RendererDidNavigateNewSubframe( |
bool NavigationControllerImpl::RendererDidNavigateAutoSubframe( |
RenderViewHost* rvh, |
- const ViewHostMsg_FrameNavigate_Params& params) { |
+ const FrameHostMsg_DidCommitProvisionalLoad_Params& params) { |
// We're guaranteed to have a previously committed entry, and we now need to |
// handle navigation inside of a subframe in it without creating a new entry. |
DCHECK(GetLastCommittedEntry()); |