summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/extension_icon_manager.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 14:43:43 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-15 14:43:43 +0000
commitf23a8c18ba3ef2d366479f6b94021d75b49e9e37 (patch)
tree4c45941d3c294be6d6121ac2dabd4101bb80e5fe /chrome/browser/extensions/extension_icon_manager.cc
parent9b488bda307fc224779706660915e8ac25d0eb8a (diff)
downloadchromium_src-f23a8c18ba3ef2d366479f6b94021d75b49e9e37.zip
chromium_src-f23a8c18ba3ef2d366479f6b94021d75b49e9e37.tar.gz
chromium_src-f23a8c18ba3ef2d366479f6b94021d75b49e9e37.tar.bz2
fav icon -> favicon. Pass 3: kFavIconSize -> kFaviconSize
BUG=76073 TEST=none; no visible change Review URL: http://codereview.chromium.org/6681041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78209 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_icon_manager.cc')
-rw-r--r--chrome/browser/extensions/extension_icon_manager.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/extensions/extension_icon_manager.cc b/chrome/browser/extensions/extension_icon_manager.cc
index f3db570..04966ac 100644
--- a/chrome/browser/extensions/extension_icon_manager.cc
+++ b/chrome/browser/extensions/extension_icon_manager.cc
@@ -54,7 +54,7 @@ void ExtensionIconManager::LoadIcon(const Extension* extension) {
pending_icons_.insert(extension->id());
image_tracker_.LoadImage(extension,
icon_resource,
- gfx::Size(kFavIconSize, kFavIconSize),
+ gfx::Size(kFaviconSize, kFaviconSize),
ImageLoadingTracker::CACHE);
}
}
@@ -68,8 +68,8 @@ const SkBitmap& ExtensionIconManager::GetIcon(const std::string& extension_id) {
result = &default_icon_;
}
DCHECK(result);
- DCHECK_EQ(kFavIconSize + padding_.width(), result->width());
- DCHECK_EQ(kFavIconSize + padding_.height(), result->height());
+ DCHECK_EQ(kFaviconSize + padding_.width(), result->width());
+ DCHECK_EQ(kFaviconSize + padding_.height(), result->height());
return *result;
}
@@ -106,10 +106,10 @@ void ExtensionIconManager::EnsureDefaultIcon() {
SkBitmap ExtensionIconManager::ApplyTransforms(const SkBitmap& source) {
SkBitmap result = source;
- if (result.width() != kFavIconSize || result.height() != kFavIconSize) {
+ if (result.width() != kFaviconSize || result.height() != kFaviconSize) {
result = skia::ImageOperations::Resize(
result, skia::ImageOperations::RESIZE_LANCZOS3,
- kFavIconSize, kFavIconSize);
+ kFaviconSize, kFaviconSize);
}
if (monochrome_) {