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

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: Address comments 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..f29e1466a35be92d618e46517774e59d81cab35f 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -620,9 +620,7 @@ CancelableTaskTracker::TaskId HistoryService::GetFavicons(
}
CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
- const GURL& page_url,
- int icon_types,
- int desired_size_in_dip,
+ const FaviconService::FaviconForURLParams& params,
const std::vector<ui::ScaleFactor>& desired_scale_factors,
const FaviconService::FaviconResultsCallback& callback,
CancelableTaskTracker* tracker) {
@@ -636,10 +634,11 @@ CancelableTaskTracker::TaskId HistoryService::GetFaviconsForURL(
FROM_HERE,
base::Bind(&HistoryBackend::GetFaviconsForURL,
history_backend_.get(),
- page_url,
- icon_types,
- desired_size_in_dip,
+ params.page_url,
+ params.icon_types,
+ params.desired_size_in_dip,
desired_scale_factors,
+ params.threshold_for_next_icon_types,
results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}
« chrome/browser/history/history_backend.cc ('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