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

Unified Diff: chrome/browser/ui/webui/favicon_source.cc

Issue 6651014: Applied the IconType. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 years, 9 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/ui/webui/favicon_source.cc
diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc
index 8461a417c78bfbd228e1f8cd4017bf8985277698..16758c2c7cff1e836562f3318f997a295dffe3b8 100644
--- a/chrome/browser/ui/webui/favicon_source.cc
+++ b/chrome/browser/ui/webui/favicon_source.cc
@@ -33,11 +33,13 @@ void FavIconSource::StartDataRequest(const std::string& path,
if (path.size() > 8 && path.substr(0, 8) == "iconurl/") {
handle = favicon_service->GetFavicon(
GURL(path.substr(8)),
+ history::FAV_ICON,
&cancelable_consumer_,
NewCallback(this, &FavIconSource::OnFavIconDataAvailable));
} else {
handle = favicon_service->GetFaviconForURL(
GURL(path),
+ history::FAV_ICON,
&cancelable_consumer_,
NewCallback(this, &FavIconSource::OnFavIconDataAvailable));
}
@@ -65,7 +67,8 @@ void FavIconSource::OnFavIconDataAvailable(
bool know_favicon,
scoped_refptr<RefCountedMemory> data,
bool expired,
- GURL icon_url) {
+ GURL icon_url,
+ history::IconType) {
sky 2011/03/09 21:41:08 name
michaelbai 2011/03/09 23:11:45 Done.
FaviconService* favicon_service =
profile_->GetFaviconService(Profile::EXPLICIT_ACCESS);
int request_id = cancelable_consumer_.GetClientData(favicon_service,

Powered by Google App Engine
This is Rietveld 408576698