GTK: center browser action badge correctly.

BUG=26025

Review URL: http://codereview.chromium.org/343028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30483 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 6 deletions

diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index 7549152..4a46a81 100755
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -63,14 +63,16 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
   const int kCenterAlignThreshold = 20;
 #endif
 
-  canvas->save();
-
 #if defined(OS_MACOSX)
-  SkTypeface* typeface =
-      SkTypeface::CreateFromName("Helvetica", SkTypeface::kBold);
+  const char kTypeFaceName[] = "Helvetica";
 #else
-  SkTypeface* typeface = SkTypeface::CreateFromName("Arial", SkTypeface::kBold);
+  const char kTypeFaceName[] = "Arial";
 #endif
+
+  canvas->save();
+
+  SkTypeface* typeface = SkTypeface::CreateFromName(kTypeFaceName,
+                                                    SkTypeface::kBold);
   SkPaint text_paint;
   text_paint.setAntiAlias(true);
   text_paint.setColor(text_color);
@@ -95,7 +97,7 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
   rect.fBottom = SkIntToScalar(bounds.bottom() - kBottomMargin);
   rect.fTop = rect.fBottom - SkIntToScalar(kBadgeHeight);
   if (badge_width >= kCenterAlignThreshold) {
-    rect.fLeft = SkIntToScalar((bounds.right() - badge_width) / 2);
+    rect.fLeft = SkIntToScalar(bounds.CenterPoint().x() - badge_width / 2);
     rect.fRight = rect.fLeft + SkIntToScalar(badge_width);
   } else {
     rect.fRight = SkIntToScalar(bounds.right());