| Index: content/browser/frame_host/navigation_handle_impl.h
|
| diff --git a/content/browser/frame_host/navigation_handle_impl.h b/content/browser/frame_host/navigation_handle_impl.h
|
| index 33e51ddab278cf281b89fe998d32159acc2210b0..f21f6632c6f1d7d7e259a0e112bdd014fdd29edd 100644
|
| --- a/content/browser/frame_host/navigation_handle_impl.h
|
| +++ b/content/browser/frame_host/navigation_handle_impl.h
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "content/browser/frame_host/render_frame_host_impl.h"
|
| #include "content/common/content_export.h"
|
| #include "url/gurl.h"
|
|
|
| @@ -62,6 +63,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| const GURL& GetURL() const override;
|
| net::Error GetNetErrorCode() const override;
|
| bool IsInMainFrame() const override;
|
| + RenderFrameHostImpl* GetRenderFrameHost() override;
|
| bool HasCommittedDocument() const override;
|
| bool HasCommittedErrorPage() const override;
|
|
|
| @@ -82,14 +84,20 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| // inform the delegate.
|
| void DidRedirectNavigation(const GURL& new_url);
|
|
|
| - // Called when the navigation was committed. This will update the |state_|
|
| - // and inform the delegate,
|
| - void DidCommitNavigation();
|
| + // Called when the navigation is ready to be committed in
|
| + // |render_frame_host|. This will update the |state_| and inform the
|
| + // delegate.
|
| + void ReadyToCommitNavigation(RenderFrameHostImpl* render_frame_host);
|
| +
|
| + // Called when the navigation was committed in |render_frame_host|. This will
|
| + // update the |state_|.
|
| + void DidCommitNavigation(RenderFrameHostImpl* render_frame_host);
|
|
|
| private:
|
| // Used to track the state the navigation is currently in.
|
| enum State {
|
| DID_START = 0,
|
| + READY_TO_COMMIT,
|
| DID_COMMIT,
|
| DID_COMMIT_ERROR_PAGE,
|
| };
|
| @@ -103,6 +111,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| net::Error net_error_code_;
|
| State state_;
|
| const bool is_main_frame_;
|
| + RenderFrameHostImpl* render_frame_host_;
|
|
|
| // Whether the navigation is in the middle of a transfer. Set to false when
|
| // the DidStartProvisionalLoad is received from the new renderer.
|
|
|