summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-01 19:15:55 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-01 19:15:55 +0000
commit68c6a198fdd8e1ac0c2109da37af76e817f17dec (patch)
treee1e60214510e670eef9e190905ee1b185fc3f857 /chrome/common/extensions
parentc17a573a2484a67dc2b27fe35d32e701564763bb (diff)
downloadchromium_src-68c6a198fdd8e1ac0c2109da37af76e817f17dec.zip
chromium_src-68c6a198fdd8e1ac0c2109da37af76e817f17dec.tar.gz
chromium_src-68c6a198fdd8e1ac0c2109da37af76e817f17dec.tar.bz2
Badge font size change to 7.5 to match more closely what we had before.
BUG=http://crbug.com/32364 TEST=See bug. Review URL: http://codereview.chromium.org/661283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40286 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions')
-rwxr-xr-xchrome/common/extensions/extension_action.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index 6f82bca..a9718a8 100755
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -19,26 +19,26 @@ namespace {
// Different platforms need slightly different constants to look good.
#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
-const int kTextSize = 9;
+const float kTextSize = 9.0;
const int kBottomMargin = 0;
const int kPadding = 2;
const int kTopTextPadding = 0;
#elif defined(OS_LINUX) && defined(TOOLKIT_VIEWS)
-const int kTextSize = 8;
+const float kTextSize = 8.0;
const int kBottomMargin = 5;
const int kPadding = 2;
const int kTopTextPadding = 1;
#elif defined(OS_MACOSX)
-const int kTextSize = 9;
+const float kTextSize = 9.0;
const int kBottomMargin = 5;
const int kPadding = 2;
const int kTopTextPadding = 0;
#else
-const int kTextSize = 7;
+const float kTextSize = 7.5;
const int kBottomMargin = 5;
const int kPadding = 2;
// The padding between the top of the badge and the top of the text.
-const int kTopTextPadding = 2;
+const int kTopTextPadding = 1;
#endif
const int kBadgeHeight = 11;
@@ -59,7 +59,7 @@ SkPaint* GetTextPaint() {
text_paint->setAntiAlias(true);
text_paint->setTextAlign(SkPaint::kLeft_Align);
- text_paint->setTextSize(SkIntToScalar(kTextSize));
+ text_paint->setTextSize(SkFloatToScalar(kTextSize));
SkTypeface* typeface = SkTypeface::CreateFromName(
kPreferredTypeface, SkTypeface::kBold);