Chromium Code Reviews| 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 #ifndef NET_URL_REQUEST_URL_REQUEST_H_ | 5 #ifndef NET_URL_REQUEST_URL_REQUEST_H_ |
| 6 #define NET_URL_REQUEST_URL_REQUEST_H_ | 6 #define NET_URL_REQUEST_URL_REQUEST_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 317 // See switches::kEnableMacCookies. | 317 // See switches::kEnableMacCookies. |
| 318 static void EnableMacCookies(); | 318 static void EnableMacCookies(); |
| 319 static bool AreMacCookiesEnabled(); | 319 static bool AreMacCookiesEnabled(); |
| 320 | 320 |
| 321 // The original url is the url used to initialize the request, and it may | 321 // The original url is the url used to initialize the request, and it may |
| 322 // differ from the url if the request was redirected. | 322 // differ from the url if the request was redirected. |
| 323 const GURL& original_url() const { return url_chain_.front(); } | 323 const GURL& original_url() const { return url_chain_.front(); } |
| 324 // The chain of urls traversed by this request. If the request had no | 324 // The chain of urls traversed by this request. If the request had no |
| 325 // redirects, this vector will contain one element. | 325 // redirects, this vector will contain one element. |
| 326 const std::vector<GURL>& url_chain() const { return url_chain_; } | 326 const std::vector<GURL>& url_chain() const { return url_chain_; } |
| 327 const GURL& url() const { return url_chain_.back(); } | 327 const GURL& url() const { |
|
cbentzel
2012/03/08 17:58:48
Why was this change needed?
ahendrickson
2012/03/08 21:33:07
I was getting a crash because url_chain_ was empty
Randy Smith (Not in Mondays)
2012/03/09 19:14:02
Did you look at why it was empty in those tests wh
ahendrickson
2012/03/09 20:50:08
No, I didn't.
I've reverted this, and will see if
| |
| 328 return url_chain_.size() ? url_chain_.back() : GURL::EmptyGURL(); | |
| 329 } | |
| 328 | 330 |
| 329 // The URL that should be consulted for the third-party cookie blocking | 331 // The URL that should be consulted for the third-party cookie blocking |
| 330 // policy. | 332 // policy. |
| 331 const GURL& first_party_for_cookies() const { | 333 const GURL& first_party_for_cookies() const { |
| 332 return first_party_for_cookies_; | 334 return first_party_for_cookies_; |
| 333 } | 335 } |
| 334 // This method may be called before Start() or FollowDeferredRedirect() is | 336 // This method may be called before Start() or FollowDeferredRedirect() is |
| 335 // called. | 337 // called. |
| 336 void set_first_party_for_cookies(const GURL& first_party_for_cookies); | 338 void set_first_party_for_cookies(const GURL& first_party_for_cookies); |
| 337 | 339 |
| (...skipping 432 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 770 scoped_refptr<AuthChallengeInfo> auth_info_; | 772 scoped_refptr<AuthChallengeInfo> auth_info_; |
| 771 | 773 |
| 772 base::TimeTicks creation_time_; | 774 base::TimeTicks creation_time_; |
| 773 | 775 |
| 774 DISALLOW_COPY_AND_ASSIGN(URLRequest); | 776 DISALLOW_COPY_AND_ASSIGN(URLRequest); |
| 775 }; | 777 }; |
| 776 | 778 |
| 777 } // namespace net | 779 } // namespace net |
| 778 | 780 |
| 779 #endif // NET_URL_REQUEST_URL_REQUEST_H_ | 781 #endif // NET_URL_REQUEST_URL_REQUEST_H_ |
| OLD | NEW |