summaryrefslogtreecommitdiffstats
path: root/ui
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 /ui
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 'ui')
-rw-r--r--ui/gfx/favicon_size.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gfx/favicon_size.h b/ui/gfx/favicon_size.h
index 5e9cd55..9d4cdbc 100644
--- a/ui/gfx/favicon_size.h
+++ b/ui/gfx/favicon_size.h
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
// Size (along each axis) of the favicon.
-const int kFavIconSize = 16;
+const int kFaviconSize = 16;
// If the width or height is bigger than the favicon size, a new width/height
// is calculated and returned in width/height that maintains the aspect
@@ -18,14 +18,14 @@ static void calc_favicon_target_size(int* width, int* height) ALLOW_UNUSED;
// static
void calc_favicon_target_size(int* width, int* height) {
- if (*width > kFavIconSize || *height > kFavIconSize) {
+ if (*width > kFaviconSize || *height > kFaviconSize) {
// Too big, resize it maintaining the aspect ratio.
float aspect_ratio = static_cast<float>(*width) /
static_cast<float>(*height);
- *height = kFavIconSize;
+ *height = kFaviconSize;
*width = static_cast<int>(aspect_ratio * *height);
- if (*width > kFavIconSize) {
- *width = kFavIconSize;
+ if (*width > kFaviconSize) {
+ *width = kFaviconSize;
*height = static_cast<int>(*width / aspect_ratio);
}
}