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

Unified Diff: ios/chrome/browser/suggestions/image_fetcher_impl.mm

Issue 2663213002: Create the IOSImageDataFetcherWrapper (Closed)
Patch Set: Address comments Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ios/chrome/browser/suggestions/image_fetcher_impl.h ('k') | ios/web/public/image_fetcher/webp_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/suggestions/image_fetcher_impl.mm
diff --git a/ios/chrome/browser/suggestions/image_fetcher_impl.mm b/ios/chrome/browser/suggestions/image_fetcher_impl.mm
index c701dfc41a9f5e50bdc1a96430d74a07512611d5..b351c30e83085fd179f1002dcad7c164b7e29143 100644
--- a/ios/chrome/browser/suggestions/image_fetcher_impl.mm
+++ b/ios/chrome/browser/suggestions/image_fetcher_impl.mm
@@ -9,7 +9,7 @@
#include "base/memory/ptr_util.h"
#include "base/threading/sequenced_worker_pool.h"
#include "components/image_fetcher/image_fetcher_delegate.h"
-#import "ios/web/public/image_fetcher/image_data_fetcher.h"
+#include "components/image_fetcher/ios/ios_image_data_fetcher_wrapper.h"
#include "net/url_request/url_request_context_getter.h"
#include "skia/ext/skia_utils_ios.h"
#include "ui/gfx/image/image.h"
@@ -23,9 +23,10 @@ namespace suggestions {
ImageFetcherImpl::ImageFetcherImpl(
net::URLRequestContextGetter* url_request_context,
base::SequencedWorkerPool* blocking_pool)
- : image_fetcher_(base::MakeUnique<web::ImageDataFetcher>(blocking_pool)) {
- image_fetcher_->SetRequestContextGetter(url_request_context);
-}
+ : image_fetcher_(
+ base::MakeUnique<image_fetcher::IOSImageDataFetcherWrapper>(
+ url_request_context,
+ blocking_pool)) {}
ImageFetcherImpl::~ImageFetcherImpl() {
}
@@ -38,8 +39,7 @@ void ImageFetcherImpl::SetImageFetcherDelegate(
void ImageFetcherImpl::SetDataUseServiceName(
DataUseServiceName data_use_service_name) {
- // Not implemented - will be obsolete once iOS also uses
- // image_fetcher::ImageDataFetcher.
+ image_fetcher_->SetDataUseServiceName(data_use_service_name);
}
void ImageFetcherImpl::StartOrQueueNetworkRequest(
@@ -58,8 +58,8 @@ void ImageFetcherImpl::StartOrQueueNetworkRequest(
const std::string fetch_id(id);
// If image_fetcher_ is destroyed the request will be cancelled and this block
// will never be called. A reference to delegate_ can be kept.
- web::ImageFetchedCallback fetcher_callback =
- ^(const GURL& original_url, int response_code, NSData* data) {
+ image_fetcher::IOSImageDataFetcherCallback fetcher_callback =
+ ^(NSData* data) {
if (data) {
// Most likely always returns 1x images.
UIImage* ui_image = [UIImage imageWithData:data scale:1];
@@ -78,7 +78,7 @@ void ImageFetcherImpl::StartOrQueueNetworkRequest(
delegate_->OnImageFetched(fetch_id, empty_image);
}
};
- image_fetcher_->StartDownload(image_url, fetcher_callback);
+ image_fetcher_->FetchImageDataWebpDecoded(image_url, fetcher_callback);
}
} // namespace suggestions
« no previous file with comments | « ios/chrome/browser/suggestions/image_fetcher_impl.h ('k') | ios/web/public/image_fetcher/webp_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698