Remove the FrameMsg_Navigate_Params

content/browser/frame_host/render_frame_host_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_
 
 #include <map>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/site_instance_impl.h"
 #include "content/common/accessibility_mode_enums.h"
 #include "content/common/content_export.h"
 #include "content/common/frame_message_enums.h"
 #include "content/common/frame_replication_state.h"
 #include "content/common/mojo/service_registry_impl.h"
+#include "content/common/navigation_params.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/javascript_message_type.h"
 #include "net/http/http_response_headers.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/page_transition_types.h"
 
 #if defined(OS_ANDROID)
 #include "content/browser/mojo/service_registry_android.h"
 #endif
 
 class GURL;
 struct AccessibilityHostMsg_EventParams;
 struct AccessibilityHostMsg_FindInPageResultParams;
 struct AccessibilityHostMsg_LocationChangeParams;
 struct FrameHostMsg_DidFailProvisionalLoadWithError_Params;
 struct FrameHostMsg_OpenURL_Params;
-struct FrameHostMsg_BeginNavigation_Params;
-struct FrameMsg_Navigate_Params;
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
 struct FrameHostMsg_ShowPopup_Params;
 #endif
 
 namespace base {
 class FilePath;
 class ListValue;
 }
 
 namespace content {
 
 class CrossProcessFrameConnector;
 class CrossSiteTransferringRequest;
 class FrameTree;
 class FrameTreeNode;
 class PermissionServiceContext;
 class RenderFrameHostDelegate;
 class RenderFrameProxyHost;
 class RenderProcessHost;
 class RenderViewHostImpl;
 class RenderWidgetHostDelegate;
 class RenderWidgetHostImpl;
 class RenderWidgetHostView;
 class ResourceRequestBody;
 class StreamHandle;
 class TimeoutMonitor;
-struct BeginNavigationParams;
-struct CommitNavigationParams;
-struct CommonNavigationParams;
 struct ContextMenuParams;
 struct GlobalRequestID;
-struct HistoryNavigationParams;
 struct Referrer;
 struct ResourceResponse;
 struct TransitionLayerData;
 
 // Flag arguments for RenderFrameHost creation.
 enum CreateRenderFrameFlags {
   // The RFH will be initially placed on the swapped out hosts list.
   CREATE_RF_SWAPPED_OUT = 1 << 0,
   // The new RenderFrame is being created for a navigation of the
   // top-level frame.
@@ skipping 209 matching lines @@
   // The current state of this RFH.
   RenderFrameHostImplState rfh_state() const { return rfh_state_; }
 
   // Sends the given navigation message. Use this rather than sending it
   // yourself since this does the internal bookkeeping described below. This
   // function takes ownership of the provided message pointer.
   //
   // If a cross-site request is in progress, we may be suspended while waiting
   // for the onbeforeunload handler, so this function might buffer the message
   // rather than sending it.
-  void Navigate(const FrameMsg_Navigate_Params& params);
+  void Navigate(const CommonNavigationParams& common_params,
+                const StartNavigationParams& start_params,
+                const CommitNavigationParams& commit_params,
+                const HistoryNavigationParams& history_params);
 
   // Load the specified URL; this is a shortcut for Navigate().
   void NavigateToURL(const GURL& url);
 
   // Treat this prospective navigation as though it originated from the frame.
   // Used, e.g., for a navigation request that originated from a RemoteFrame.
   // |source_site_instance| is the SiteInstance of the frame that initiated the
   // navigation.
   // TODO(creis): Remove this method and have RenderFrameProxyHost call
   // RequestOpenURL with its FrameTreeNode.
@@ skipping 307 matching lines @@
   // the renderer process.  Currently only used for subframes.
   // TODO(creis): Use this for main frames as well when RVH goes away.
   bool render_frame_created_;
 
   // Whether we should buffer outgoing Navigate messages rather than sending
   // them. This will be true when a RenderFrameHost is created for a cross-site
   // request, until we hear back from the onbeforeunload handler of the old
   // RenderFrameHost.
   bool navigations_suspended_;
 
-  // We only buffer the params for a suspended navigation while this RFH is the
-  // pending RenderFrameHost of a RenderFrameHostManager. There will only ever
-  // be one suspended navigation, because RenderFrameHostManager will destroy
-  // the pending RenderFrameHost and create a new one if a second navigation
-  // occurs.
-  scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_;
+  // Holds the parameters for a suspended navigation. This can only happen while
+  // this RFH is the pending RenderFrameHost of a RenderFrameHostManager. There
+  // will only ever be one suspended navigation, because RenderFrameHostManager
+  // will destroy the pending RenderFrameHost and create a new one if a second
+  // navigation occurs.
+  // PlzNavigate: unused as navigations are never suspended.
+  struct NavigateParams {

[nasko, 2015/03/09 23:24:23]

Let's name this so that it is obvious it is used only for suspended navigations.
Let's say SuspendedNavigationParams?

[clamy, 2015/03/10 16:45:44]

I've moved it to navigation_params.h to reuse in RenderViewImpl.

+    NavigateParams(const CommonNavigationParams& common_params,
+                   const StartNavigationParams& start_params,
+                   const CommitNavigationParams& commit_params,
+                   const HistoryNavigationParams& history_params);
+    ~NavigateParams();
+
+    const CommonNavigationParams common_params;
+    const StartNavigationParams start_params;
+    // The navigation start timestamp in |commit_params| is updated with the
+    // time at which BeforeUnload completed.
+    CommitNavigationParams commit_params;
+    const HistoryNavigationParams history_params;
+  };
+  scoped_ptr<NavigateParams> suspended_nav_params_;
 
   // When the last BeforeUnload message was sent.
   base::TimeTicks send_before_unload_start_time_;
 
   // Used to track whether sudden termination is allowed for this frame.
   // has_beforeunload_handlers_ and has_unload_handlers_ are also used to avoid
   // asking the renderer process to run BeforeUnload or Unload during
   // navigation. The browser can set override_sudden_termination_status_ to
   // true, in which case sudden termination will be allowed. This is used when a
   // renderer executing BeforeUnload or Unload is unresponsive. All other values
@@ skipping 59 matching lines @@
 
   // NOTE: This must be the last member.
   base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_RENDER_FRAME_HOST_IMPL_H_