PlzNavigate: Remove the RequestNavigation IPC

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>
 
@@ skipping 45 matching lines @@
 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 Referrer;
 struct ResourceResponse;
 struct TransitionLayerData;
 
 // Flag arguments for RenderFrameHost creation.
 enum CreateRenderFrameFlags {
@@ skipping 240 matching lines @@
   // user decided the navigation should proceed should be passed as
   // |proceed_time|.
   void SetNavigationsSuspended(bool suspend,
                                const base::TimeTicks& proceed_time);
 
   // Clears any suspended navigation state after a cross-site navigation is
   // canceled or suspended. This is important if we later return to this
   // RenderFrameHost.
   void CancelSuspendedNavigations();
 
-  // Runs the beforeunload handler for this frame. |for_cross_site_transition|
-  // indicates whether this call is for the current frame during a cross-process
+  // Runs the beforeunload handler for this frame. |for_navigation| indicates
+  // whether this call is for the current frame during a cross-process
   // navigation. False means we're closing the entire tab.
-  void DispatchBeforeUnload(bool for_cross_site_transition);
+  // PlzNavigate: this call happens on all browser-initiated navigations.
+  void DispatchBeforeUnload(bool for_navigation);
 
   // Set the frame's opener to null in the renderer process in response to an
   // action in another renderer process.
   void DisownOpener();
 
   // Deletes the current selection plus the specified number of characters
   // before and after the selection or caret.
   void ExtendSelectionAndDelete(size_t before, size_t after);
 
   // Notifies the RenderFrame that the JavaScript message that was shown was
@@ skipping 130 matching lines @@
                                 IPC::Message* reply_msg);
   void OnTextSurroundingSelectionResponse(const base::string16& content,
                                           size_t start_offset,
                                           size_t end_offset);
   void OnDidAccessInitialDocument();
   void OnDidDisownOpener();
   void OnDidAssignPageId(int32 page_id);
   void OnUpdateTitle(const base::string16& title,
                      blink::WebTextDirection title_direction);
   void OnUpdateEncoding(const std::string& encoding);
-  void OnBeginNavigation(const FrameHostMsg_BeginNavigation_Params& params,
-                         const CommonNavigationParams& common_params);
+  void OnBeginNavigation(const CommonNavigationParams& common_params,
+                         const BeginNavigationParams& begin_params,
+                         scoped_refptr<ResourceRequestBody> body);
   void OnAccessibilityEvents(
       const std::vector<AccessibilityHostMsg_EventParams>& params,
       int reset_token);
   void OnAccessibilityLocationChanges(
       const std::vector<AccessibilityHostMsg_LocationChangeParams>& params);
   void OnAccessibilityFindInPageResult(
       const AccessibilityHostMsg_FindInPageResultParams& params);
   void OnToggleFullscreen(bool enter_fullscreen);
 
 #if defined(OS_MACOSX) || defined(OS_ANDROID)
@@ skipping 123 matching lines @@
   // When either this value or IsWaitingForUnloadACK is true, the value of
   // unload_ack_is_for_cross_site_transition_ indicates whether this is for a
   // cross-site transition or a tab close attempt.
   // TODO(clamy): Remove this boolean and add one more state to the state
   // machine.
   bool is_waiting_for_beforeunload_ack_;
 
   // Valid only when is_waiting_for_beforeunload_ack_ or
   // IsWaitingForUnloadACK is true.  This tells us if the unload request
   // is for closing the entire tab ( = false), or only this RenderFrameHost in
-  // the case of a cross-site transition ( = true).
-  bool unload_ack_is_for_cross_site_transition_;
+  // the case of a navigation ( = true). Currently only cross-site navigations
+  // require a beforeUnload/unload ACK.
+  // PlzNavigate: all navigations require a beforeUnload ACK.
+  bool unload_ack_is_for_navigation_;
 
   // Used to swap out or shut down this RFH when the unload event is taking too
   // long to execute, depending on the number of active frames in the
   // SiteInstance.
   scoped_ptr<TimeoutMonitor> swapout_event_monitor_timeout_;
 
   scoped_ptr<ServiceRegistryImpl> service_registry_;
 
 #if defined(OS_ANDROID)
   scoped_ptr<ServiceRegistryAndroid> service_registry_android_;
@@ skipping 28 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_