| 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 e9206b4b72430269b023cc1017832b0c51c7e43b..a33f5bccd7a4c24737b40c882a1525fd3c2994ea 100644
|
| --- a/content/browser/frame_host/navigation_controller_impl.h
|
| +++ b/content/browser/frame_host/navigation_controller_impl.h
|
| @@ -16,7 +16,7 @@
|
| #include "content/public/browser/navigation_controller.h"
|
| #include "content/public/browser/navigation_type.h"
|
|
|
| -struct ViewHostMsg_FrameNavigate_Params;
|
| +struct FrameHostMsg_DidCommitProvisionalLoad_Params;
|
|
|
| namespace content {
|
| class NavigationEntryImpl;
|
| @@ -136,9 +136,10 @@ class CONTENT_EXPORT NavigationControllerImpl
|
| // and it will return false.
|
| //
|
| // TODO(creis): Change RenderViewHost to RenderFrameHost.
|
| - bool RendererDidNavigate(RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params,
|
| - LoadCommittedDetails* details);
|
| + bool RendererDidNavigate(
|
| + RenderViewHost* rvh,
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
|
| + LoadCommittedDetails* details);
|
|
|
| // Notifies us that we just became active. This is used by the WebContentsImpl
|
| // so that we know to load URLs that were pending as "lazy" loads.
|
| @@ -235,7 +236,7 @@ class CONTENT_EXPORT NavigationControllerImpl
|
| // Classifies the given renderer navigation (see the NavigationType enum).
|
| NavigationType ClassifyNavigation(
|
| RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params) const;
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params) const;
|
|
|
| // Causes the controller to load the specified entry. The function assumes
|
| // ownership of the pointer since it is put in the navigation list.
|
| @@ -258,24 +259,24 @@ class CONTENT_EXPORT NavigationControllerImpl
|
| // TODO(creis): Change RenderViewHost to RenderFrameHost.
|
| void RendererDidNavigateToNewPage(
|
| RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params,
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
|
| bool replace_entry);
|
| void RendererDidNavigateToExistingPage(
|
| RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params);
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
|
| void RendererDidNavigateToSamePage(
|
| RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params);
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
|
| void RendererDidNavigateInPage(
|
| RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params,
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
|
| bool* did_replace_entry);
|
| void RendererDidNavigateNewSubframe(
|
| RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params);
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
|
| bool RendererDidNavigateAutoSubframe(
|
| RenderViewHost* rvh,
|
| - const ViewHostMsg_FrameNavigate_Params& params);
|
| + const FrameHostMsg_DidCommitProvisionalLoad_Params& params);
|
|
|
| // Helper function for code shared between Reload() and ReloadIgnoringCache().
|
| void ReloadInternal(bool check_for_repost, ReloadType reload_type);
|
|
|