OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/loader/cross_site_resource_handler.h" | 5 #include "content/browser/loader/cross_site_resource_handler.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 // Cleanup back-pointer stored on the request info. | 127 // Cleanup back-pointer stored on the request info. |
128 GetRequestInfo()->set_cross_site_handler(NULL); | 128 GetRequestInfo()->set_cross_site_handler(NULL); |
129 } | 129 } |
130 | 130 |
131 bool CrossSiteResourceHandler::OnRequestRedirected( | 131 bool CrossSiteResourceHandler::OnRequestRedirected( |
132 const GURL& new_url, | 132 const GURL& new_url, |
133 ResourceResponse* response, | 133 ResourceResponse* response, |
134 bool* defer) { | 134 bool* defer) { |
135 // Top-level requests change their cookie first-party URL on redirects, while | 135 // Top-level requests change their cookie first-party URL on redirects, while |
136 // subframes retain the parent's value. | 136 // subframes retain the parent's value. |
137 if (GetRequestInfo()->GetResourceType() == ResourceType::MAIN_FRAME) | 137 if (GetRequestInfo()->GetResourceType() == RESOURCE_TYPE_MAIN_FRAME) |
138 request()->set_first_party_for_cookies(new_url); | 138 request()->set_first_party_for_cookies(new_url); |
139 | 139 |
140 // We should not have started the transition before being redirected. | 140 // We should not have started the transition before being redirected. |
141 DCHECK(!in_cross_site_transition_); | 141 DCHECK(!in_cross_site_transition_); |
142 return next_handler_->OnRequestRedirected(new_url, response, defer); | 142 return next_handler_->OnRequestRedirected(new_url, response, defer); |
143 } | 143 } |
144 | 144 |
145 bool CrossSiteResourceHandler::OnResponseStarted( | 145 bool CrossSiteResourceHandler::OnResponseStarted( |
146 ResourceResponse* response, | 146 ResourceResponse* response, |
147 bool* defer) { | 147 bool* defer) { |
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
439 controller()->Resume(); | 439 controller()->Resume(); |
440 } | 440 } |
441 } | 441 } |
442 | 442 |
443 void CrossSiteResourceHandler::OnDidDefer() { | 443 void CrossSiteResourceHandler::OnDidDefer() { |
444 did_defer_ = true; | 444 did_defer_ = true; |
445 request()->LogBlockedBy("CrossSiteResourceHandler"); | 445 request()->LogBlockedBy("CrossSiteResourceHandler"); |
446 } | 446 } |
447 | 447 |
448 } // namespace content | 448 } // namespace content |
OLD | NEW |