| Index: content/browser/frame_host/render_frame_host_impl.h
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
|
| index 82ccf957d82eac324f90ee7b7d7bb12759b1a267..e1a5c6939c8168a0f07b55b5c6a26038a14273c7 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.h
|
| +++ b/content/browser/frame_host/render_frame_host_impl.h
|
| @@ -53,6 +53,7 @@ struct ContextMenuParams;
|
| struct GlobalRequestID;
|
| struct Referrer;
|
| struct ShowDesktopNotificationHostMsgParams;
|
| +struct TransitionLayerData;
|
|
|
| class CONTENT_EXPORT RenderFrameHostImpl
|
| : public RenderFrameHost,
|
| @@ -154,8 +155,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| // receieved.
|
| void OnDeferredAfterResponseStarted(
|
| const GlobalRequestID& global_request_id,
|
| - const scoped_refptr<net::HttpResponseHeaders>& headers,
|
| - const GURL& url);
|
| + const TransitionLayerData& transition_data);
|
|
|
| // Tells the renderer that this RenderFrame is being swapped out for one in a
|
| // different renderer process. It should run its unload handler, move to
|
| @@ -206,10 +206,9 @@ class CONTENT_EXPORT RenderFrameHostImpl
|
| // Called when an HTML5 notification is closed.
|
| void NotificationClosed(int notification_id);
|
|
|
| - // Sets whether there is an outstanding transition request. This is called at
|
| - // the start of a provisional load for the main frame, and cleared when we
|
| - // hear the response or commit.
|
| - void SetHasPendingTransitionRequest(bool has_pending_request);
|
| + // Clears any outstanding transition request. This is called when we hear the
|
| + // response or commit.
|
| + void ClearPendingTransitionRequestData();
|
|
|
| // Send a message to the renderer process to change the accessibility mode.
|
| void SetAccessibilityMode(AccessibilityMode AccessibilityMode);
|
|
|