| 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 71b5341f7cdcea14c8d1aa3349694835327e885b..39778ed598916bcfe9634168e8d956673e765637 100644
|
| --- a/content/browser/frame_host/navigation_handle_impl.h
|
| +++ b/content/browser/frame_host/navigation_handle_impl.h
|
| @@ -6,30 +6,33 @@
|
| #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
|
|
|
| #include "content/public/browser/navigation_handle.h"
|
|
|
| #include <stddef.h>
|
|
|
| #include "base/callback.h"
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| +#include "base/supports_user_data.h"
|
| #include "content/browser/frame_host/frame_tree_node.h"
|
| +#include "content/browser/frame_host/navigation_user_data.h"
|
| #include "content/browser/frame_host/render_frame_host_impl.h"
|
| #include "content/common/content_export.h"
|
| #include "content/public/browser/navigation_throttle.h"
|
| #include "url/gurl.h"
|
|
|
| struct FrameHostMsg_DidCommitProvisionalLoad_Params;
|
|
|
| namespace content {
|
|
|
| +class NavigationUserData;
|
| class NavigatorDelegate;
|
| class ServiceWorkerContextWrapper;
|
| class ServiceWorkerNavigationHandle;
|
| struct NavigationRequestInfo;
|
|
|
| // This class keeps track of a single navigation. It is created upon receipt of
|
| // a DidStartProvisionalLoad IPC in a RenderFrameHost. The RenderFrameHost owns
|
| // the newly created NavigationHandleImpl as long as the navigation is ongoing.
|
| // The NavigationHandleImpl in the RenderFrameHost will be reset when the
|
| // navigation stops, that is if one of the following events happen:
|
| @@ -207,20 +210,24 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| RenderFrameHostImpl* render_frame_host,
|
| scoped_refptr<net::HttpResponseHeaders> response_headers);
|
|
|
| // Called when the navigation was committed in |render_frame_host|. This will
|
| // update the |state_|.
|
| void DidCommitNavigation(
|
| const FrameHostMsg_DidCommitProvisionalLoad_Params& params,
|
| bool same_page,
|
| RenderFrameHostImpl* render_frame_host);
|
|
|
| + void SetNavigationSupportsUserData(
|
| + scoped_ptr<NavigationSupportsUserData> navigation_supports_user_data);
|
| + base::SupportsUserData::Data* GetUserData(const void* key) override;
|
| +
|
| private:
|
| friend class NavigationHandleImplTest;
|
|
|
| // Used to track the state the navigation is currently in.
|
| enum State {
|
| INITIAL = 0,
|
| WILL_SEND_REQUEST,
|
| DEFERRING_START,
|
| WILL_REDIRECT_REQUEST,
|
| DEFERRING_REDIRECT,
|
| @@ -288,16 +295,18 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle {
|
| int pending_nav_entry_id_;
|
|
|
| // This callback will be run when all throttle checks have been performed.
|
| ThrottleChecksFinishedCallback complete_callback_;
|
|
|
| // PlzNavigate
|
| // Manages the lifetime of a pre-created ServiceWorkerProviderHost until a
|
| // corresponding ServiceWorkerNetworkProvider is created in the renderer.
|
| scoped_ptr<ServiceWorkerNavigationHandle> service_worker_handle_;
|
|
|
| + scoped_ptr<NavigationSupportsUserData> navigation_supports_user_data_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(NavigationHandleImpl);
|
| };
|
|
|
| } // namespace content
|
|
|
| #endif // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_HANDLE_IMPL_H_
|
|
|