| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 77b19aec12c3189b0578141f51bf5b5fa8868a9d..2f4796827cc1222a0fe6202c12d2fe97ff2f5309 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -102,8 +102,6 @@ struct CommitNavigationParams;
|
| struct CommonNavigationParams;
|
| struct CustomContextMenuContext;
|
| struct FrameReplicationState;
|
| -struct HistoryNavigationParams;
|
| -struct RequestNavigationParams;
|
| struct ResourceResponseHead;
|
| struct StartNavigationParams;
|
|
|
| @@ -533,8 +531,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| // this back to private member.
|
| void OnNavigate(const CommonNavigationParams& common_params,
|
| const StartNavigationParams& start_params,
|
| - const CommitNavigationParams& commit_params,
|
| - const HistoryNavigationParams& history_params);
|
| + const CommitNavigationParams& commit_params);
|
|
|
| // Make this frame show an empty, unscriptable page.
|
| // TODO(nasko): Remove this method once swapped out state is no longer used.
|
| @@ -642,8 +639,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| void OnCommitNavigation(const ResourceResponseHead& response,
|
| const GURL& stream_url,
|
| const CommonNavigationParams& common_params,
|
| - const CommitNavigationParams& commit_params,
|
| - const HistoryNavigationParams& history_params);
|
| + const CommitNavigationParams& commit_params);
|
|
|
| // Virtual since overridden by WebTestProxy for layout tests.
|
| virtual blink::WebNavigationPolicy DecidePolicyForNavigation(
|
| @@ -710,7 +706,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| bool PrepareRenderViewForNavigation(
|
| const GURL& url,
|
| bool is_history_navigation,
|
| - const HistoryNavigationParams& history_params,
|
| + const CommitNavigationParams& commit_params,
|
| bool* is_reload,
|
| blink::WebURLRequest::CachePolicy* cache_policy);
|
|
|
|
|