PlzNavigate: Remove the RequestNavigation IPC

content/browser/frame_host/navigator.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_NAVIGATOR_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
@@ skipping 10 matching lines @@
 }
 
 namespace content {
 
 class FrameTreeNode;
 class NavigationControllerImpl;
 class NavigationEntryImpl;
 class NavigationRequest;
 class NavigatorDelegate;
 class RenderFrameHostImpl;
+class ResourceRequestBody;
 class StreamHandle;
+struct BeginNavigationParams;
 struct CommonNavigationParams;
 struct ResourceResponse;
 
 // Implementations of this interface are responsible for performing navigations
 // in a node of the FrameTree. Its lifetime is bound to all FrameTreeNode
 // objects that are using it and will be released once all nodes that use it are
 // freed. The Navigator is bound to a single frame tree and cannot be used by
 // multiple instances of FrameTree.
 // TODO(nasko): Move all navigation methods, such as didStartProvisionalLoad
 // from WebContentsImpl to this interface.
@@ skipping 67 matching lines @@
       const GURL& url,
       SiteInstance* source_site_instance,
       const std::vector<GURL>& redirect_chain,
       const Referrer& referrer,
       ui::PageTransition page_transition,
       WindowOpenDisposition disposition,
       const GlobalRequestID& transferred_global_request_id,
       bool should_replace_current_entry,
       bool user_gesture) {}
 
-  // PlzNavigate: Used to start a navigation. OnBeginNavigation is called
-  // directly by RequestNavigation when there is no live renderer. Otherwise, it
-  // is called following a BeginNavigation IPC from the renderer (which in
-  // browser-initiated navigation also happens after RequestNavigation has been
-  // called).
+  // PlzNavigate
+  // Called after receiving a BeforeUnloadACK IPC from the renderer. If
+  // |frame_tree_node| has a NavigationRequest waiting for the renderer
+  // response, then the request is either started or canceled, depending on the
+  // value of |proceed|.
+  virtual void OnBeforeUnloadACK(FrameTreeNode* frame_tree_node,
+                                 bool proceed) {}
+
+  // PlzNavigate
+  // Used to start a new renderer-initiated navigation, following a
+  // BeginNavigation IPC from the renderer.
   virtual void OnBeginNavigation(
       FrameTreeNode* frame_tree_node,
-      const FrameHostMsg_BeginNavigation_Params& params,
-      const CommonNavigationParams& common_params) {}
+      const CommonNavigationParams& common_params,
+      const BeginNavigationParams& begin_params,
+      scoped_refptr<ResourceRequestBody> body) {}

[davidben, 2015/02/03 02:23:21]

MSVC is being grumpy about the compile. I think the problem is this function
can't be inline; the empty body has an implicit call to
~scoped_refptr<ResourceRequestBody> which needs to have the definition of
ResourceRequestBody available. (Same reason CommitNavigation below isn't
inline.)

Not sure why it's only MSVC.

[clamy, 2015/02/03 16:17:09]

Done.

 
   // PlzNavigate
   // Signal |render_frame_host| that a navigation is ready to commit (the
   // response to the navigation request has been received).
   virtual void CommitNavigation(FrameTreeNode* frame_tree_node,
                                 ResourceResponse* response,
                                 scoped_ptr<StreamHandle> body);
 
   // PlzNavigate
   // Cancel a NavigationRequest for |frame_tree_node|. Called when
@@ skipping 17 matching lines @@
   virtual bool IsWaitingForBeforeUnloadACK(FrameTreeNode* frame_tree_node);
 
  protected:
   friend class base::RefCounted<Navigator>;
   virtual ~Navigator() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATOR_H_