OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "base/json/json_parser.h" | 5 #include "base/json/json_parser.h" |
6 #include "base/strings/utf_string_conversions.h" | 6 #include "base/strings/utf_string_conversions.h" |
7 #include "base/values.h" | 7 #include "base/values.h" |
8 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" | 8 #include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h" |
9 #include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_andro
id.h" | 9 #include "chrome/browser/enhanced_bookmarks/android/bookmark_image_service_andro
id.h" |
10 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h" | 10 #include "chrome/browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h" |
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
247 void BookmarkImageServiceAndroid::BitmapFetcherHandler::Start( | 247 void BookmarkImageServiceAndroid::BitmapFetcherHandler::Start( |
248 content::BrowserContext* browser_context, | 248 content::BrowserContext* browser_context, |
249 const std::string& referrer, | 249 const std::string& referrer, |
250 net::URLRequest::ReferrerPolicy referrer_policy, | 250 net::URLRequest::ReferrerPolicy referrer_policy, |
251 int load_flags, | 251 int load_flags, |
252 bool update_bookmark, | 252 bool update_bookmark, |
253 const GURL& page_url) { | 253 const GURL& page_url) { |
254 update_bookmark_ = update_bookmark; | 254 update_bookmark_ = update_bookmark; |
255 page_url_ = page_url; | 255 page_url_ = page_url; |
256 | 256 |
257 bitmap_fetcher_.Start(browser_context->GetRequestContext(), referrer, | 257 bitmap_fetcher_.Init(browser_context->GetRequestContext(), referrer, |
258 referrer_policy, load_flags); | 258 referrer_policy, load_flags); |
| 259 bitmap_fetcher_.Start(); |
259 } | 260 } |
260 | 261 |
261 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete( | 262 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete( |
262 const GURL& url, | 263 const GURL& url, |
263 const SkBitmap* bitmap) { | 264 const SkBitmap* bitmap) { |
264 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); | 265 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
265 | 266 |
266 scoped_ptr<gfx::Image> image; | 267 scoped_ptr<gfx::Image> image; |
267 if (bitmap) { | 268 if (bitmap) { |
268 gfx::ImageSkia imageSkia = gfx::ImageSkia::CreateFrom1xBitmap(*bitmap); | 269 gfx::ImageSkia imageSkia = gfx::ImageSkia::CreateFrom1xBitmap(*bitmap); |
269 imageSkia.MakeThreadSafe(); | 270 imageSkia.MakeThreadSafe(); |
270 image.reset(new gfx::Image(imageSkia)); | 271 image.reset(new gfx::Image(imageSkia)); |
271 } else { | 272 } else { |
272 image.reset(new gfx::Image()); | 273 image.reset(new gfx::Image()); |
273 } | 274 } |
274 service_->ProcessNewImage(page_url_, update_bookmark_, url, image.Pass()); | 275 service_->ProcessNewImage(page_url_, update_bookmark_, url, image.Pass()); |
275 | 276 |
276 delete this; | 277 delete this; |
277 } | 278 } |
278 | 279 |
279 } // namespace enhanced_bookmarks | 280 } // namespace enhanced_bookmarks |
OLD | NEW |