Move browser initiated navigation from RenderViewHost to RenderFrameHost.

content/browser/renderer_host/render_view_host_impl.h

 // Copyright (c) 2012 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_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 14 matching lines @@
 #include "net/base/load_states.h"
 #include "third_party/WebKit/public/web/WebAXEnums.h"
 #include "third_party/WebKit/public/web/WebConsoleMessage.h"
 #include "third_party/WebKit/public/web/WebPopupType.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/window_open_disposition.h"
 
 class SkBitmap;
-class ViewMsg_Navigate;
+class FrameMsg_Navigate;
 struct AccessibilityHostMsg_EventParams;
 struct AccessibilityHostMsg_LocationChangeParams;
 struct MediaPlayerAction;
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewHostMsg_OpenURL_Params;
 struct ViewHostMsg_SelectionBounds_Params;
 struct ViewHostMsg_ShowPopup_Params;
-struct ViewMsg_Navigate_Params;
+struct FrameMsg_Navigate_Params;
 struct ViewMsg_PostMessage_Params;
 
 namespace base {
 class ListValue;
 }
 
 namespace gfx {
 class Range;
 }
 
@@ skipping 215 matching lines @@
   // Returns the content specific prefs for this RenderViewHost.
   WebPreferences GetWebkitPrefs(const GURL& url);
 
   // 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 ViewMsg_Navigate_Params& message);
+  // TODO(nasko): Remove this method once all callers are converted to use
+  // RenderFrameHostImpl.
+  void Navigate(const FrameMsg_Navigate_Params& message);
 
   // Load the specified URL, this is a shortcut for Navigate().
+  // TODO(nasko): Remove this method once all callers are converted to use
+  // RenderFrameHostImpl.
   void NavigateToURL(const GURL& url);
 
   // Returns whether navigation messages are currently suspended for this
   // RenderViewHost.  Only true during a cross-site navigation, while waiting
   // for the onbeforeunload handler.
   bool are_navigations_suspended() const { return navigations_suspended_; }
 
   // Suspends (or unsuspends) any navigation messages from being sent from this
   // RenderViewHost.  This is called when a pending RenderViewHost is created
   // for a cross-site navigation, because we must suspend any navigations until
@@ skipping 380 matching lines @@
   // Whether we should buffer outgoing Navigate messages rather than sending
   // them.  This will be true when a RenderViewHost is created for a cross-site
   // request, until we hear back from the onbeforeunload handler of the old
   // RenderViewHost.
   bool navigations_suspended_;
 
   // We only buffer the params for a suspended navigation while we have a
   // pending RVH for a WebContentsImpl.  There will only ever be one suspended
   // navigation, because WebContentsImpl will destroy the pending RVH and create
   // a new one if a second navigation occurs.
-  scoped_ptr<ViewMsg_Navigate_Params> suspended_nav_params_;
+  scoped_ptr<FrameMsg_Navigate_Params> suspended_nav_params_;

[Charlie Reis, 2014/02/13 01:23:53]

Hmm, a bunch of this navigation state belongs on RFH, because it's possible to
have navigations on two separate frames at the same time.  I suppose that's
beyond the scope of this CL (meaning we'll still only support navigation in one
RFH at a time), but we should at least put TODOs on each bit of state that needs
to move.  I think that includes at least:

navigations_suspended_
suspended_nav_params_
rvh_state_
is_waiting_for_beforeunload_ack_
unload_ack_is_for_cross_site_transition_
send_should_close_start_time_
unload_event_monitor_timeout_
pending_shutdown_on_swap_out_

[nasko, 2014/02/13 17:05:27]

I think a lot of other state will have to move as well, so I didn't mark them
explicitly. The ones you point out are navigational ones, so I've added TODOs.

 
   // Whether the initial empty page of this view has been accessed by another
   // page, making it unsafe to show the pending URL.  Usually false unless
   // another window tries to modify the blank page.  Always false after the
   // first commit.
   bool has_accessed_initial_document_;
 
   // The current state of this RVH.
   RenderViewHostImplState rvh_state_;
 
@@ skipping 71 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(RenderViewHostImpl);
 };
 
 #if defined(COMPILER_MSVC)
 #pragma warning(pop)
 #endif
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_IMPL_H_