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

Unified Diff: chrome/browser/history/history_service.cc

Issue 26563004: Find Favicon in priority of icon_type. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 2 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: chrome/browser/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index aee38c899a9c99b5635cd81d1526576acad38e1e..512807f48250c042b325bc47ba16ba6cf28e32da 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -621,9 +621,10 @@ CancelableTaskTracker::TaskId HistoryService::GetFavicons(
CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
const GURL& page_url,
- int icon_types,
+ const std::vector<int>& icon_types_priority,
int desired_size_in_dip,
const std::vector<ui::ScaleFactor>& desired_scale_factors,
+ int threshold_for_next_icon_types,
const FaviconService::FaviconResultsCallback& callback,
CancelableTaskTracker* tracker) {
DCHECK(thread_checker_.CalledOnValidThread());
@@ -637,9 +638,10 @@ CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
base::Bind(&HistoryBackend::GetFaviconsForURL,
history_backend_.get(),
page_url,
- icon_types,
+ icon_types_priority,
desired_size_in_dip,
desired_scale_factors,
+ threshold_for_next_icon_types,
results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}
« chrome/browser/history/history_service.h ('K') | « chrome/browser/history/history_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698