Chromium Code Reviews| Index: content/browser/frame_host/navigation_handle_impl.cc |
| diff --git a/content/browser/frame_host/navigation_handle_impl.cc b/content/browser/frame_host/navigation_handle_impl.cc |
| index da20a1ee15fb52f76dc45c63fd26058e4f232110..c0346c3c5a41ed8531556b2cf8d55f0c2be77eab 100644 |
| --- a/content/browser/frame_host/navigation_handle_impl.cc |
| +++ b/content/browser/frame_host/navigation_handle_impl.cc |
| @@ -72,7 +72,8 @@ NavigationHandleImpl::NavigationHandleImpl( |
| frame_tree_node_(frame_tree_node), |
| next_index_(0), |
| navigation_start_(navigation_start), |
| - pending_nav_entry_id_(pending_nav_entry_id) { |
| + pending_nav_entry_id_(pending_nav_entry_id), |
| + request_context_type_(REQUEST_CONTEXT_TYPE_UNSPECIFIED) { |
| DCHECK(!navigation_start.is_null()); |
| GetDelegate()->DidStartNavigation(this); |
| @@ -102,6 +103,11 @@ NavigatorDelegate* NavigationHandleImpl::GetDelegate() const { |
| return frame_tree_node_->navigator()->GetDelegate(); |
| } |
| +RequestContextType NavigationHandleImpl::GetFetchRequestContextType() const { |
| + CHECK_GE(state_, WILL_SEND_REQUEST); |
|
clamy
2016/07/22 13:51:31
DCHECK.
carlosk
2016/07/22 16:00:29
Done.
|
| + return request_context_type_; |
| +} |
| + |
| const GURL& NavigationHandleImpl::GetURL() { |
| return url_; |
| } |
| @@ -270,6 +276,7 @@ NavigationHandleImpl::CallWillStartRequestForTesting( |
| WillStartRequest(method, resource_request_body, sanitized_referrer, |
| has_user_gesture, transition, is_external_protocol, |
| + REQUEST_CONTEXT_TYPE_LOCATION, |
| base::Bind(&UpdateThrottleCheckResult, &result)); |
| // Reset the callback to ensure it will not be called later. |
| @@ -305,6 +312,7 @@ void NavigationHandleImpl::WillStartRequest( |
| bool has_user_gesture, |
| ui::PageTransition transition, |
| bool is_external_protocol, |
| + RequestContextType request_context_type, |
| const ThrottleChecksFinishedCallback& callback) { |
| // |method != "POST"| should imply absence of |resource_request_body|. |
| if (method != "POST" && resource_request_body) { |
| @@ -320,7 +328,7 @@ void NavigationHandleImpl::WillStartRequest( |
| has_user_gesture_ = has_user_gesture; |
| transition_ = transition; |
| is_external_protocol_ = is_external_protocol; |
| - |
| + request_context_type_ = request_context_type; |
| state_ = WILL_SEND_REQUEST; |
| complete_callback_ = callback; |