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..6d649e057364bde27935e5c0fdc65bee449dbb2a 100644 |
--- a/content/browser/frame_host/render_frame_host_manager.h |
+++ b/content/browser/frame_host/render_frame_host_manager.h |
@@ -43,6 +43,7 @@ class RenderWidgetHostView; |
class TestWebContents; |
class WebUIImpl; |
struct NavigationBeforeCommitInfo; |
+struct NavigationParamsWithRequestAndCommitInfo; |
// Manages RenderFrameHosts for a FrameTreeNode. This class acts as a state |
// machine to make cross-process navigations in a frame possible. |
@@ -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<NavigationParamsWithRequestAndCommitInfo> navigation_params); |
// 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<NavigationParamsWithRequestAndCommitInfo> navigation_params_; |
Charlie Reis
2014/09/15 21:19:40
I want to be careful before we add navigation-spec
clamy
2014/09/18 20:50:39
We need some of this state when the navigation is
|
+ |
base::WeakPtrFactory<RenderFrameHostManager> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(RenderFrameHostManager); |