Index: content/browser/renderer_host/render_view_host_impl.h |
diff --git a/content/browser/renderer_host/render_view_host_impl.h b/content/browser/renderer_host/render_view_host_impl.h |
index 8fc9d1633d3c2365f1c5f9f2070dd5d8dd3aa185..69cac7b756e3936803e425fde7324e085a9abfa1 100644 |
--- a/content/browser/renderer_host/render_view_host_impl.h |
+++ b/content/browser/renderer_host/render_view_host_impl.h |
@@ -32,7 +32,7 @@ |
#include "ui/base/window_open_disposition.h" |
class SkBitmap; |
-class ViewMsg_Navigate; |
+class FrameMsg_Navigate; |
struct AccessibilityHostMsg_EventParams; |
struct AccessibilityHostMsg_LocationChangeParams; |
struct MediaPlayerAction; |
@@ -40,7 +40,7 @@ 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 { |
@@ -276,9 +276,13 @@ class CONTENT_EXPORT RenderViewHostImpl |
// 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 |
@@ -679,7 +683,7 @@ class CONTENT_EXPORT RenderViewHostImpl |
// 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 R
nasko
2014/02/13 17:05:27
I think a lot of other state will have to move as
|
// 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 |