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

Unified Diff: components/history/core/browser/history_service.cc

Issue 2828173002: [Refactor] Simplify HistoryBackend::UpdateFaviconMappingsAndFetchImpl() signature (Closed)
Patch Set: Merge branch 'master' into icon_type0 Created 3 years, 8 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/history/core/browser/history_service.cc
diff --git a/components/history/core/browser/history_service.cc b/components/history/core/browser/history_service.cc
index b9ebe00521add936bbbd9d22696e8edf2421a08b..c84a75c5651b94fac84867348de50cdc3dbe1279 100644
--- a/components/history/core/browser/history_service.cc
+++ b/components/history/core/browser/history_service.cc
@@ -502,9 +502,9 @@ void HistoryService::AddPagesWithDetails(const URLRows& info,
history_backend_, info, visit_source));
}
-base::CancelableTaskTracker::TaskId HistoryService::GetFavicons(
- const std::vector<GURL>& icon_urls,
- int icon_types,
+base::CancelableTaskTracker::TaskId HistoryService::GetFavicon(
+ const GURL& icon_url,
+ favicon_base::IconType icon_type,
const std::vector<int>& desired_sizes,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
@@ -515,8 +515,8 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFavicons(
new std::vector<favicon_base::FaviconRawBitmapResult>();
return tracker->PostTaskAndReply(
backend_task_runner_.get(), FROM_HERE,
- base::Bind(&HistoryBackend::GetFavicons, history_backend_, icon_urls,
- icon_types, desired_sizes, results),
+ base::Bind(&HistoryBackend::GetFavicon, history_backend_, icon_url,
+ icon_type, desired_sizes, results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}
@@ -575,8 +575,8 @@ base::CancelableTaskTracker::TaskId HistoryService::GetFaviconForID(
base::CancelableTaskTracker::TaskId
HistoryService::UpdateFaviconMappingsAndFetch(
const GURL& page_url,
- const std::vector<GURL>& icon_urls,
- int icon_types,
+ const GURL& icon_url,
+ favicon_base::IconType icon_type,
const std::vector<int>& desired_sizes,
const favicon_base::FaviconResultsCallback& callback,
base::CancelableTaskTracker* tracker) {
@@ -588,8 +588,8 @@ HistoryService::UpdateFaviconMappingsAndFetch(
return tracker->PostTaskAndReply(
backend_task_runner_.get(), FROM_HERE,
base::Bind(&HistoryBackend::UpdateFaviconMappingsAndFetch,
- history_backend_, page_url, icon_urls, icon_types,
- desired_sizes, results),
+ history_backend_, page_url, icon_url, icon_type, desired_sizes,
+ results),
base::Bind(&RunWithFaviconResults, callback, base::Owned(results)));
}

Powered by Google App Engine
This is Rietveld 408576698