Index: content/renderer/render_view_impl.h |
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h |
index a3eb957d2483cbc449442713ca63df5b0f8d3460..8241b628d5e1653ff9e7b823557fb67b799e826e 100644 |
--- a/content/renderer/render_view_impl.h |
+++ b/content/renderer/render_view_impl.h |
@@ -75,7 +75,7 @@ class CommandLine; |
class PepperDeviceTest; |
class SkBitmap; |
struct PP_NetAddress_Private; |
-struct ViewMsg_Navigate_Params; |
+struct FrameMsg_Navigate_Params; |
struct ViewMsg_PostMessage_Params; |
struct ViewMsg_StopFinding_Params; |
@@ -807,9 +807,7 @@ class CONTENT_EXPORT RenderViewImpl |
CONNECTION_ERROR, |
}; |
- static blink::WebReferrerPolicy GetReferrerPolicyFromRequest( |
Charlie Reis
2014/02/13 01:23:53
Why is this no longer needed? Dead code?
nasko
2014/02/13 17:05:27
Jochen removed the implementation in https://coder
|
- blink::WebFrame* frame, |
- const blink::WebURLRequest& request); |
+ static bool IsReload(const FrameMsg_Navigate_Params& params); |
static Referrer GetReferrerFromRequest( |
blink::WebFrame* frame, |
@@ -927,7 +925,7 @@ class CONTENT_EXPORT RenderViewImpl |
void OnPluginActionAt(const gfx::Point& location, |
const blink::WebPluginAction& action); |
void OnMoveOrResizeStarted(); |
- void OnNavigate(const ViewMsg_Navigate_Params& params); |
+ void OnNavigate(const FrameMsg_Navigate_Params& params); |
Charlie Reis
2014/02/13 01:23:53
Maybe we should move this out of the IPC handlers
nasko
2014/02/13 17:05:27
Done.
|
void OnPostMessageEvent(const ViewMsg_PostMessage_Params& params); |
void OnReleaseDisambiguationPopupDIB(TransportDIB::Handle dib_handle); |
void OnReloadFrame(); |
@@ -1028,7 +1026,7 @@ class CONTENT_EXPORT RenderViewImpl |
// Returns true if the |params| navigation is to an entry that has been |
// cropped due to a recent navigation the browser did not know about. |
- bool IsBackForwardToStaleEntry(const ViewMsg_Navigate_Params& params, |
+ bool IsBackForwardToStaleEntry(const FrameMsg_Navigate_Params& params, |
bool is_reload); |
// Make this RenderView show an empty, unscriptable page. |
@@ -1181,7 +1179,7 @@ class CONTENT_EXPORT RenderViewImpl |
// the WebDataSource::ExtraData attribute. We use pending_navigation_state_ |
// as a temporary holder for the state until the WebDataSource corresponding |
// to the new navigation is created. See DidCreateDataSource. |
- scoped_ptr<ViewMsg_Navigate_Params> pending_navigation_params_; |
+ scoped_ptr<FrameMsg_Navigate_Params> pending_navigation_params_; |
Charlie Reis
2014/02/13 01:23:53
TODO to move this?
nasko
2014/02/13 17:05:27
Done.
|
// Timer used to delay the updating of nav state (see SyncNavigationState). |
base::OneShotTimer<RenderViewImpl> nav_state_sync_timer_; |