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

Unified Diff: components/bookmarks/browser/bookmark_model.cc

Issue 331163003: [Refactor] Change FaviconService API to take in a desired pixel size (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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
Index: components/bookmarks/browser/bookmark_model.cc
diff --git a/components/bookmarks/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index 13cd1ee1ae1dc163e39eb69a4f09273a92839ede..d9246c4ea07aad5ca3963b397c6eb79d37e896f2 100644
--- a/components/bookmarks/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -959,18 +959,29 @@ void BookmarkModel::LoadFavicon(
DCHECK(node->url().is_valid());
node->set_favicon_state(BookmarkNode::LOADING_FAVICON);
- base::CancelableTaskTracker::TaskId taskId = client_->GetFaviconImageForURL(
- node->url(),
- icon_type,
- icon_type == favicon_base::FAVICON ? gfx::kFaviconSize : 0,
- base::Bind(
- &BookmarkModel::OnFaviconDataAvailable,
- base::Unretained(this),
- node,
- icon_type),
- &cancelable_task_tracker_);
- if (taskId != base::CancelableTaskTracker::kBadTaskId)
- node->set_favicon_load_task_id(taskId);
+ base::CancelableTaskTracker::TaskId task_id =
+ base::CancelableTaskTracker::kBadTaskId;
+ if (icon_type == favicon_base::FAVICON) {
+ task_id = client_->GetFaviconImageForPageURL(
+ node->url(),
+ base::Bind(
+ &BookmarkModel::OnFaviconDataAvailable,
+ base::Unretained(this),
+ node,
+ icon_type),
+ &cancelable_task_tracker_);
+ } else {
+ task_id = client_->GetTouchFaviconImageForPageURL(
+ node->url(),
+ base::Bind(
+ &BookmarkModel::OnFaviconDataAvailable,
+ base::Unretained(this),
+ node,
+ icon_type),
+ &cancelable_task_tracker_);
+ }
+ if (task_id != base::CancelableTaskTracker::kBadTaskId)
+ node->set_favicon_load_task_id(task_id);
}
void BookmarkModel::FaviconLoaded(const BookmarkNode* node) {

Powered by Google App Engine
This is Rietveld 408576698