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

Unified Diff: chrome/browser/fav_icon_helper.cc

Issue 6681041: fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« no previous file with comments | « chrome/browser/extensions/extension_web_ui.cc ('k') | chrome/browser/importer/importer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/fav_icon_helper.cc
diff --git a/chrome/browser/fav_icon_helper.cc b/chrome/browser/fav_icon_helper.cc
index a40ec2a7ffbcdc970dc8ab50721ba0abb2ee66ef..b68cad79a1588f2df1a1cb7519d7402643ecc3b5 100644
--- a/chrome/browser/fav_icon_helper.cc
+++ b/chrome/browser/fav_icon_helper.cc
@@ -77,7 +77,7 @@ void FavIconHelper::SetFavIcon(
const GURL& image_url,
const SkBitmap& image) {
const SkBitmap& sized_image =
- (image.width() == kFavIconSize && image.height() == kFavIconSize)
+ (image.width() == kFaviconSize && image.height() == kFaviconSize)
? image : ConvertToFavIconSize(image);
if (GetFaviconService() && ShouldSaveFavicon(url)) {
@@ -227,7 +227,7 @@ void FavIconHelper::DownloadFavIconOrAskHistory(NavigationEntry* entry) {
DCHECK(entry); // We should only get here if entry is valid.
if (fav_icon_expired_) {
// We have the mapping, but the favicon is out of date. Download it now.
- ScheduleDownload(entry->url(), entry->favicon().url(), kFavIconSize, NULL);
+ ScheduleDownload(entry->url(), entry->favicon().url(), kFaviconSize, NULL);
} else if (GetFaviconService()) {
// We don't know the favicon, but we may have previously downloaded the
// favicon for another page that shares the same favicon. Ask for the
@@ -274,7 +274,7 @@ void FavIconHelper::OnFavIconData(
if (!know_favicon || expired) {
// We don't know the favicon, or it is out of date. Request the current one.
- ScheduleDownload(entry->url(), entry->favicon().url(), kFavIconSize, NULL);
+ ScheduleDownload(entry->url(), entry->favicon().url(), kFaviconSize, NULL);
}
}
« no previous file with comments | « chrome/browser/extensions/extension_web_ui.cc ('k') | chrome/browser/importer/importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698