| 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) {
|
|
|