PlzNavigate: support for should_replace_current_entry

content/common/navigation_params.h

 // Copyright 2014 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_COMMON_NAVIGATION_PARAMS_H_
 #define CONTENT_COMMON_NAVIGATION_PARAMS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 24 matching lines @@
 // Provided by the browser or the renderer -------------------------------------
 
 // Used by all navigation IPCs.
 struct CONTENT_EXPORT CommonNavigationParams {
   CommonNavigationParams();
   CommonNavigationParams(const GURL& url,
                          const Referrer& referrer,
                          ui::PageTransition transition,
                          FrameMsg_Navigate_Type::Value navigation_type,
                          bool allow_download,
+                         bool should_replace_current_entry,
                          base::TimeTicks ui_timestamp,
                          FrameMsg_UILoadMetricsReportType::Value report_type,
                          const GURL& base_url_for_data_url,
                          const GURL& history_url_for_data_url);
   ~CommonNavigationParams();
 
   // The URL to navigate to.
   // PlzNavigate: May be modified when the navigation is ready to commit.
   GURL url;
 
   // The URL to send in the "Referer" header field. Can be empty if there is
   // no referrer.
   Referrer referrer;
 
   // The type of transition.
   ui::PageTransition transition;
 
   // Type of navigation.
   FrameMsg_Navigate_Type::Value navigation_type;
 
   // Allows the URL to be downloaded (true by default).
   // Avoid downloading when in view-source mode.
   bool allow_download;
 
+  // Informs the RenderView the pending navigation should replace the current
+  // history entry when it commits. This is used for cross-process redirects so
+  // the transferred navigation can recover the navigation state.
+  // PlzNavigate: this is used by client-side redirects to indicate that when
+  // the navigation commits, it should commit in the existing page.
+  bool should_replace_current_entry;
+
   // Timestamp of the user input event that triggered this navigation. Empty if
   // the navigation was not triggered by clicking on a link or by receiving an
   // intent on Android.
   base::TimeTicks ui_timestamp;
 
   // The report type to be used when recording the metric using |ui_timestamp|.
   FrameMsg_UILoadMetricsReportType::Value report_type;
 
   // Base URL for use in Blink's SubstituteData.
   // Is only used with data: URLs.
@@ skipping 48 matching lines @@
 // The difference with the RequestNavigationParams below is that they are only
 // used in the current architecture of navigation, and will not be used by
 // PlzNavigate.
 // PlzNavigate: These are not used.
 struct CONTENT_EXPORT StartNavigationParams {
   StartNavigationParams();
   StartNavigationParams(
       bool is_post,
       const std::string& extra_headers,
       const std::vector<unsigned char>& browser_initiated_post_data,
-      bool should_replace_current_entry,
       int transferred_request_child_id,
       int transferred_request_request_id);
   ~StartNavigationParams();
 
   // Whether the navigation is a POST request (as opposed to a GET).
   bool is_post;
 
   // Extra headers (separated by \n) to send during the request.
   std::string extra_headers;
 
   // If is_post is true, holds the post_data information from browser. Empty
   // otherwise.
   std::vector<unsigned char> browser_initiated_post_data;
 
-  // Informs the RenderView the pending navigation should replace the current
-  // history entry when it commits. This is used for cross-process redirects so
-  // the transferred navigation can recover the navigation state.
-  bool should_replace_current_entry;
-
   // The following two members identify a previous request that has been
   // created before this navigation is being transferred to a new render view.
   // This serves the purpose of recycling the old request.
   // Unless this refers to a transferred navigation, these values are -1 and -1.
   int transferred_request_child_id;
   int transferred_request_request_id;
 };
 
 // Used by FrameMsg_Navigate. Holds the parameters needed by the renderer to
 // start a browser-initiated navigation besides those in CommonNavigationParams.
@@ skipping 92 matching lines @@
   ~NavigationParams();
 
   CommonNavigationParams common_params;
   StartNavigationParams start_params;
   RequestNavigationParams request_params;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_NAVIGATION_PARAMS_H_