Chromium Code Reviews| 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 ac7680ab0ba80d7ac6dc5ac172a9e09363bb604b..1cfe3467c491bae54ada1ae615b677e384bdf7b3 100644 |
| --- a/content/browser/frame_host/navigation_handle_impl.h |
| +++ b/content/browser/frame_host/navigation_handle_impl.h |
| @@ -18,6 +18,7 @@ |
| #include "content/common/content_export.h" |
| #include "content/public/browser/navigation_data.h" |
| #include "content/public/browser/navigation_throttle.h" |
| +#include "content/public/common/request_context_type.h" |
| #include "url/gurl.h" |
| struct FrameHostMsg_DidCommitProvisionalLoad_Params; |
| @@ -26,7 +27,6 @@ namespace content { |
| class NavigatorDelegate; |
| class ResourceRequestBodyImpl; |
| -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 |
| @@ -163,6 +163,10 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
| return resource_request_body_; |
| } |
| + RequestContextType fetch_request_context_type() const { |
| + return fetch_request_context_type_; |
|
Mike West
2016/07/20 09:52:46
You never verify this value in a test; I know it's
carlosk
2016/07/20 10:12:02
Yes, but it will be verified once the main mixed c
Mike West
2016/07/20 11:56:36
I'd prefer to see a unit test land along with the
carlosk
2016/07/20 16:26:27
Done.
|
| + } |
| + |
| typedef base::Callback<void(NavigationThrottle::ThrottleCheckResult)> |
| ThrottleChecksFinishedCallback; |
| @@ -176,6 +180,7 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
| bool has_user_gesture, |
| ui::PageTransition transition, |
| bool is_external_protocol, |
| + RequestContextType fetch_request_context_type, |
| const ThrottleChecksFinishedCallback& callback); |
| // Called when the URLRequest will be redirected in the network stack. |
| @@ -309,6 +314,9 @@ class CONTENT_EXPORT NavigationHandleImpl : public NavigationHandle { |
| // The unique id of the corresponding NavigationEntry. |
| int pending_nav_entry_id_; |
| + // The fetch request context type. |
| + RequestContextType fetch_request_context_type_; |
| + |
| // This callback will be run when all throttle checks have been performed. |
| ThrottleChecksFinishedCallback complete_callback_; |