Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/url_request/url_fetcher.h" | 8 #include "net/url_request/url_fetcher.h" |
| 9 #include "net/url_request/url_request.h" | 9 #include "net/url_request/url_request.h" |
| 10 #include "net/url_request/url_request_context_getter.h" | 10 #include "net/url_request/url_request_context_getter.h" |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 28 // The callback to run after the image data was fetched. The callback will | 28 // The callback to run after the image data was fetched. The callback will |
| 29 // be run even if the image data could not be fetched successfully. | 29 // be run even if the image data could not be fetched successfully. |
| 30 ImageDataFetcherCallback callback; | 30 ImageDataFetcherCallback callback; |
| 31 | 31 |
| 32 std::unique_ptr<net::URLFetcher> url_fetcher; | 32 std::unique_ptr<net::URLFetcher> url_fetcher; |
| 33 }; | 33 }; |
| 34 | 34 |
| 35 ImageDataFetcher::ImageDataFetcher( | 35 ImageDataFetcher::ImageDataFetcher( |
| 36 net::URLRequestContextGetter* url_request_context_getter) | 36 net::URLRequestContextGetter* url_request_context_getter) |
| 37 : url_request_context_getter_(url_request_context_getter), | 37 : url_request_context_getter_(url_request_context_getter), |
| 38 data_use_service_name_(DataUseUserData::NOT_TAGGED), | 38 data_use_service_name_(DataUseUserData::IMAGE_FETCHER_UNTAGGED), |
| 39 next_url_fetcher_id_(0) {} | 39 next_url_fetcher_id_(0) {} |
| 40 | 40 |
| 41 ImageDataFetcher::~ImageDataFetcher() {} | 41 ImageDataFetcher::~ImageDataFetcher() {} |
| 42 | 42 |
| 43 void ImageDataFetcher::SetDataUseServiceName( | 43 void ImageDataFetcher::SetDataUseServiceName( |
| 44 DataUseServiceName data_use_service_name) { | 44 DataUseServiceName data_use_service_name) { |
| 45 data_use_service_name_ = data_use_service_name; | 45 data_use_service_name_ = data_use_service_name; |
| 46 } | 46 } |
| 47 | 47 |
| 48 void ImageDataFetcher::FetchImageData( | 48 void ImageDataFetcher::FetchImageData( |
| 49 const GURL& url, const ImageDataFetcherCallback& callback) { | 49 const GURL& url, const ImageDataFetcherCallback& callback) { |
| 50 std::unique_ptr<net::URLFetcher> url_fetcher = | 50 std::unique_ptr<net::URLFetcher> url_fetcher = |
| 51 net::URLFetcher::Create( | 51 net::URLFetcher::Create( |
| 52 next_url_fetcher_id_++, url, net::URLFetcher::GET, this); | 52 next_url_fetcher_id_++, url, net::URLFetcher::GET, this); |
| 53 | 53 |
| 54 if (data_use_service_name_ != DataUseUserData::NOT_TAGGED) { | 54 if (data_use_service_name_ != DataUseUserData::IMAGE_FETCHER_UNTAGGED) { |
|
Marc Treib
2017/01/23 10:39:02
I think the "if" should be removed now. As it is,
Raj
2017/01/23 18:06:27
Done.
| |
| 55 DataUseUserData::AttachToFetcher(url_fetcher.get(), data_use_service_name_); | 55 DataUseUserData::AttachToFetcher(url_fetcher.get(), data_use_service_name_); |
| 56 } | 56 } |
| 57 | 57 |
| 58 std::unique_ptr<ImageDataFetcherRequest> request( | 58 std::unique_ptr<ImageDataFetcherRequest> request( |
| 59 new ImageDataFetcherRequest(callback, std::move(url_fetcher))); | 59 new ImageDataFetcherRequest(callback, std::move(url_fetcher))); |
| 60 request->url_fetcher->SetRequestContext(url_request_context_getter_.get()); | 60 request->url_fetcher->SetRequestContext(url_request_context_getter_.get()); |
| 61 request->url_fetcher->Start(); | 61 request->url_fetcher->Start(); |
| 62 | 62 |
| 63 pending_requests_[request->url_fetcher.get()] = std::move(request); | 63 pending_requests_[request->url_fetcher.get()] = std::move(request); |
| 64 } | 64 } |
| 65 | 65 |
| 66 void ImageDataFetcher::OnURLFetchComplete(const net::URLFetcher* source) { | 66 void ImageDataFetcher::OnURLFetchComplete(const net::URLFetcher* source) { |
| 67 auto request_iter = pending_requests_.find(source); | 67 auto request_iter = pending_requests_.find(source); |
| 68 DCHECK(request_iter != pending_requests_.end()); | 68 DCHECK(request_iter != pending_requests_.end()); |
| 69 | 69 |
| 70 std::string image_data; | 70 std::string image_data; |
| 71 if (source->GetStatus().status() == net::URLRequestStatus::SUCCESS) { | 71 if (source->GetStatus().status() == net::URLRequestStatus::SUCCESS) { |
| 72 source->GetResponseAsString(&image_data); | 72 source->GetResponseAsString(&image_data); |
| 73 } | 73 } |
| 74 request_iter->second->callback.Run(image_data); | 74 request_iter->second->callback.Run(image_data); |
| 75 | 75 |
| 76 // Remove the finished request. | 76 // Remove the finished request. |
| 77 pending_requests_.erase(request_iter); | 77 pending_requests_.erase(request_iter); |
| 78 } | 78 } |
| 79 | 79 |
| 80 } // namespace image_fetcher | 80 } // namespace image_fetcher |
| OLD | NEW |