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

4 files changed, 8 insertions, 8 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_) {
diff --git a/chrome/browser/extensions/extension_icon_manager.h b/chrome/browser/extensions/extension_icon_manager.h
index 41e01c3..6ce37a1 100644
--- a/chrome/browser/extensions/extension_icon_manager.h
+++ b/chrome/browser/extensions/extension_icon_manager.h
@@ -25,7 +25,7 @@ class ExtensionIconManager : public ImageLoadingTracker::Observer {
   // Start loading the icon for the given extension.
   void LoadIcon(const Extension* extension);
 
-  // This returns a bitmap of width/height kFavIconSize, loaded either from an
+  // This returns a bitmap of width/height kFaviconSize, loaded either from an
   // entry specified in the extension's 'icon' section of the manifest, or a
   // default extension icon.
   const SkBitmap& GetIcon(const std::string& extension_id);
diff --git a/chrome/browser/extensions/extension_menu_manager.h b/chrome/browser/extensions/extension_menu_manager.h
index 5e11f09..1834b41 100644
--- a/chrome/browser/extensions/extension_menu_manager.h
+++ b/chrome/browser/extensions/extension_menu_manager.h
@@ -240,7 +240,7 @@ class ExtensionMenuManager : public NotificationObserver {
                       const ContextMenuParams& params,
                       const ExtensionMenuItem::Id& menuItemId);
 
-  // This returns a bitmap of width/height kFavIconSize, loaded either from an
+  // This returns a bitmap of width/height kFaviconSize, loaded either from an
   // entry specified in the extension's 'icon' section of the manifest, or a
   // default extension icon.
   const SkBitmap& GetIconForExtension(const std::string& extension_id);
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index ec52de0..368541e 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -76,7 +76,7 @@ class ExtensionWebUIImageLoadingTracker : public ImageLoadingTracker::Observer {
                                       ExtensionIconSet::MATCH_EXACTLY);
 
       tracker_.LoadImage(extension_, icon_resource,
-                         gfx::Size(kFavIconSize, kFavIconSize),
+                         gfx::Size(kFaviconSize, kFaviconSize),
                          ImageLoadingTracker::DONT_CACHE);
     } else {
       ForwardResult(NULL);