| Index: content/browser/frame_host/render_frame_host_manager.h
|
| diff --git a/content/browser/frame_host/render_frame_host_manager.h b/content/browser/frame_host/render_frame_host_manager.h
|
| index 48a5f24b6f4e79f999567b0770c82fd6565c22ae..11d3c4a3ab2212a64452525d4e54dcdb968bd99b 100644
|
| --- a/content/browser/frame_host/render_frame_host_manager.h
|
| +++ b/content/browser/frame_host/render_frame_host_manager.h
|
| @@ -29,6 +29,7 @@ class FrameTreeNode;
|
| class NavigationControllerImpl;
|
| class NavigationEntry;
|
| class NavigationEntryImpl;
|
| +class NavigationParameters;
|
| class NavigationRequest;
|
| class RenderFrameHost;
|
| class RenderFrameHostDelegate;
|
| @@ -316,8 +317,8 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
|
| // PlzNavigate: sends a RequestNavigation IPC to the renderer to ask it to
|
| // navigate. If no live renderer is present, then the navigation request will
|
| // be sent directly to the ResourceDispatcherHost.
|
| - bool RequestNavigation(const NavigationEntryImpl& entry,
|
| - const FrameMsg_Navigate_Params& navigate_params);
|
| + bool RequestNavigation(
|
| + scoped_ptr<NavigationParameters> navigation_parameters);
|
|
|
| // PlzNavigate: Used to start a navigation. OnBeginNavigation is called
|
| // directly by RequestNavigation when there is no live renderer. Otherwise, it
|
| @@ -535,6 +536,10 @@ class CONTENT_EXPORT RenderFrameHostManager : public NotificationObserver {
|
| // it commits.
|
| scoped_ptr<NavigationRequest> navigation_request_;
|
|
|
| + // PlzNavigate: Holds info that should be sent to the renderer when the
|
| + // navigation is about to commit.
|
| + scoped_ptr<NavigationParameters> navigation_parameters_;
|
| +
|
| base::WeakPtrFactory<RenderFrameHostManager> weak_factory_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager);
|
|
|