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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 bitmap_fetcher_handler->Start( | 82 bitmap_fetcher_handler->Start( |
83 browser_context_, referrer, referrer_policy, | 83 browser_context_, referrer, referrer_policy, |
84 net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES, | 84 net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES, |
85 update_bookmark, page_url); | 85 update_bookmark, page_url); |
86 } | 86 } |
87 | 87 |
88 void BookmarkImageServiceAndroid::RetrieveSalientImageFromContext( | 88 void BookmarkImageServiceAndroid::RetrieveSalientImageFromContext( |
89 content::RenderFrameHost* render_frame_host, | 89 content::RenderFrameHost* render_frame_host, |
90 const GURL& page_url, | 90 const GURL& page_url, |
91 bool update_bookmark) { | 91 bool update_bookmark) { |
92 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 92 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
93 if (IsPageUrlInProgress(page_url)) | 93 if (IsPageUrlInProgress(page_url)) |
94 return; // A request for this URL is already in progress. | 94 return; // A request for this URL is already in progress. |
95 | 95 |
96 const BookmarkNode* bookmark = enhanced_bookmark_model_->bookmark_model() | 96 const BookmarkNode* bookmark = enhanced_bookmark_model_->bookmark_model() |
97 ->GetMostRecentlyAddedUserNodeForURL(page_url); | 97 ->GetMostRecentlyAddedUserNodeForURL(page_url); |
98 if (!bookmark) | 98 if (!bookmark) |
99 return; | 99 return; |
100 | 100 |
101 // Stop the image extraction if there is already an image present. | 101 // Stop the image extraction if there is already an image present. |
102 GURL url; | 102 GURL url; |
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
252 update_bookmark_ = update_bookmark; | 252 update_bookmark_ = update_bookmark; |
253 page_url_ = page_url; | 253 page_url_ = page_url; |
254 | 254 |
255 bitmap_fetcher_.Start(browser_context->GetRequestContext(), referrer, | 255 bitmap_fetcher_.Start(browser_context->GetRequestContext(), referrer, |
256 referrer_policy, load_flags); | 256 referrer_policy, load_flags); |
257 } | 257 } |
258 | 258 |
259 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete( | 259 void BookmarkImageServiceAndroid::BitmapFetcherHandler::OnFetchComplete( |
260 const GURL& url, | 260 const GURL& url, |
261 const SkBitmap* bitmap) { | 261 const SkBitmap* bitmap) { |
262 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 262 DCHECK_CURRENTLY_ON(content::BrowserThread::UI); |
263 | 263 |
264 scoped_ptr<gfx::Image> image; | 264 scoped_ptr<gfx::Image> image; |
265 if (bitmap) { | 265 if (bitmap) { |
266 gfx::ImageSkia imageSkia = gfx::ImageSkia::CreateFrom1xBitmap(*bitmap); | 266 gfx::ImageSkia imageSkia = gfx::ImageSkia::CreateFrom1xBitmap(*bitmap); |
267 imageSkia.MakeThreadSafe(); | 267 imageSkia.MakeThreadSafe(); |
268 image.reset(new gfx::Image(imageSkia)); | 268 image.reset(new gfx::Image(imageSkia)); |
269 } else { | 269 } else { |
270 image.reset(new gfx::Image()); | 270 image.reset(new gfx::Image()); |
271 } | 271 } |
272 service_->ProcessNewImage(page_url_, update_bookmark_, url, image.Pass()); | 272 service_->ProcessNewImage(page_url_, update_bookmark_, url, image.Pass()); |
273 | 273 |
274 delete this; | 274 delete this; |
275 } | 275 } |
276 | 276 |
277 } // namespace enhanced_bookmarks | 277 } // namespace enhanced_bookmarks |
OLD | NEW |