Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(220)

Side by Side Diff: components/image_fetcher/image_data_fetcher.cc

Issue 2756633003: [Image Fetcher] Add support to disable cookies (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "components/image_fetcher/image_data_fetcher.h" 5 #include "components/image_fetcher/image_data_fetcher.h"
6 6
7 #include "net/base/load_flags.h" 7 #include "net/base/load_flags.h"
8 #include "net/http/http_response_headers.h" 8 #include "net/http/http_response_headers.h"
9 #include "net/http/http_status_code.h" 9 #include "net/http/http_status_code.h"
10 #include "net/url_request/url_fetcher.h" 10 #include "net/url_request/url_fetcher.h"
(...skipping 20 matching lines...) Expand all
31 // be run even if the image data could not be fetched successfully. 31 // be run even if the image data could not be fetched successfully.
32 ImageDataFetcherCallback callback; 32 ImageDataFetcherCallback callback;
33 33
34 std::unique_ptr<net::URLFetcher> url_fetcher; 34 std::unique_ptr<net::URLFetcher> url_fetcher;
35 }; 35 };
36 36
37 ImageDataFetcher::ImageDataFetcher( 37 ImageDataFetcher::ImageDataFetcher(
38 net::URLRequestContextGetter* url_request_context_getter) 38 net::URLRequestContextGetter* url_request_context_getter)
39 : url_request_context_getter_(url_request_context_getter), 39 : url_request_context_getter_(url_request_context_getter),
40 data_use_service_name_(DataUseUserData::IMAGE_FETCHER_UNTAGGED), 40 data_use_service_name_(DataUseUserData::IMAGE_FETCHER_UNTAGGED),
41 next_url_fetcher_id_(0) {} 41 next_url_fetcher_id_(0),
42 disable_cookies_(false) {}
markusheintz_ 2017/03/16 09:59:06 The default should be true. If we need a way to
42 43
43 ImageDataFetcher::~ImageDataFetcher() {} 44 ImageDataFetcher::~ImageDataFetcher() {}
44 45
45 void ImageDataFetcher::SetDataUseServiceName( 46 void ImageDataFetcher::SetDataUseServiceName(
46 DataUseServiceName data_use_service_name) { 47 DataUseServiceName data_use_service_name) {
47 data_use_service_name_ = data_use_service_name; 48 data_use_service_name_ = data_use_service_name;
48 } 49 }
49 50
51 void ImageDataFetcher::DisableCookies() {
52 disable_cookies_ = true;
53 }
54
50 void ImageDataFetcher::FetchImageData( 55 void ImageDataFetcher::FetchImageData(
51 const GURL& image_url, 56 const GURL& image_url,
52 const ImageDataFetcherCallback& callback) { 57 const ImageDataFetcherCallback& callback) {
53 FetchImageData( 58 FetchImageData(
54 image_url, callback, /*referrer=*/std::string(), 59 image_url, callback, /*referrer=*/std::string(),
55 net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE); 60 net::URLRequest::CLEAR_REFERRER_ON_TRANSITION_FROM_SECURE_TO_INSECURE);
56 } 61 }
57 62
58 void ImageDataFetcher::FetchImageData( 63 void ImageDataFetcher::FetchImageData(
59 const GURL& image_url, 64 const GURL& image_url,
60 const ImageDataFetcherCallback& callback, 65 const ImageDataFetcherCallback& callback,
61 const std::string& referrer, 66 const std::string& referrer,
62 net::URLRequest::ReferrerPolicy referrer_policy) { 67 net::URLRequest::ReferrerPolicy referrer_policy) {
63 std::unique_ptr<net::URLFetcher> url_fetcher = net::URLFetcher::Create( 68 std::unique_ptr<net::URLFetcher> url_fetcher = net::URLFetcher::Create(
64 next_url_fetcher_id_++, image_url, net::URLFetcher::GET, this); 69 next_url_fetcher_id_++, image_url, net::URLFetcher::GET, this);
65 70
66 DataUseUserData::AttachToFetcher(url_fetcher.get(), data_use_service_name_); 71 DataUseUserData::AttachToFetcher(url_fetcher.get(), data_use_service_name_);
67 72
68 std::unique_ptr<ImageDataFetcherRequest> request( 73 std::unique_ptr<ImageDataFetcherRequest> request(
69 new ImageDataFetcherRequest(callback, std::move(url_fetcher))); 74 new ImageDataFetcherRequest(callback, std::move(url_fetcher)));
70 request->url_fetcher->SetRequestContext(url_request_context_getter_.get()); 75 request->url_fetcher->SetRequestContext(url_request_context_getter_.get());
71 request->url_fetcher->SetReferrer(referrer); 76 request->url_fetcher->SetReferrer(referrer);
72 request->url_fetcher->SetReferrerPolicy(referrer_policy); 77 request->url_fetcher->SetReferrerPolicy(referrer_policy);
78 if (disable_cookies_) {
markusheintz_ 2017/03/16 09:59:06 Not fetching cookies should be the default.
79 request->url_fetcher->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
80 net::LOAD_DO_NOT_SAVE_COOKIES);
81 }
73 request->url_fetcher->Start(); 82 request->url_fetcher->Start();
74 83
75 pending_requests_[request->url_fetcher.get()] = std::move(request); 84 pending_requests_[request->url_fetcher.get()] = std::move(request);
76 } 85 }
77 86
78 void ImageDataFetcher::OnURLFetchComplete(const net::URLFetcher* source) { 87 void ImageDataFetcher::OnURLFetchComplete(const net::URLFetcher* source) {
79 auto request_iter = pending_requests_.find(source); 88 auto request_iter = pending_requests_.find(source);
80 DCHECK(request_iter != pending_requests_.end()); 89 DCHECK(request_iter != pending_requests_.end());
81 90
82 bool success = source->GetStatus().status() == net::URLRequestStatus::SUCCESS; 91 bool success = source->GetStatus().status() == net::URLRequestStatus::SUCCESS;
(...skipping 10 matching lines...) Expand all
93 if (success) { 102 if (success) {
94 source->GetResponseAsString(&image_data); 103 source->GetResponseAsString(&image_data);
95 } 104 }
96 request_iter->second->callback.Run(image_data, metadata); 105 request_iter->second->callback.Run(image_data, metadata);
97 106
98 // Remove the finished request. 107 // Remove the finished request.
99 pending_requests_.erase(request_iter); 108 pending_requests_.erase(request_iter);
100 } 109 }
101 110
102 } // namespace image_fetcher 111 } // namespace image_fetcher
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698