Merge 29556 - Revert "Revert 29457, because this is making ExtensionBrowserTe...

chrome/common/extensions/extension_action.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
 #include "base/gfx/rect.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "grit/app_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 
 ExtensionAction::ExtensionAction()
   : type_(PAGE_ACTION) {
 }
 
 ExtensionAction::~ExtensionAction() {
 }
 
 void ExtensionActionState::PaintBadge(gfx::Canvas* canvas,
-                                      const gfx::Rect& bounds) {
+                                      const gfx::Rect& bounds) const {
   const std::string& text = badge_text();
   if (text.empty())
     return;
 
   // Different platforms need slightly different constants to look good.
 #if defined(OS_LINUX)
   const int kTextSize = 9;
   const int kBottomMargin = 4;
   const int kPadding = 2;
   const int kBadgeHeight = 12;
   const int kMaxTextWidth = 23;
   // The minimum width for center-aligning the badge.
   const int kCenterAlignThreshold = 20;
 #else
   const int kTextSize = 8;
   const int kBottomMargin = 5;
   const int kPadding = 2;
   const int kBadgeHeight = 11;
   const int kMaxTextWidth = 23;
   // The minimum width for center-aligning the badge.
   const int kCenterAlignThreshold = 20;
 #endif
 
   canvas->save();
 
   SkTypeface* typeface = SkTypeface::CreateFromName("Arial", SkTypeface::kBold);
   SkPaint text_paint;
   text_paint.setAntiAlias(true);
-  text_paint.setColor(SK_ColorWHITE);
+  text_paint.setColor(badge_text_color());
   text_paint.setFakeBoldText(true);
   text_paint.setTextAlign(SkPaint::kLeft_Align);
   text_paint.setTextSize(SkIntToScalar(kTextSize));
   text_paint.setTypeface(typeface);
 
   // Calculate text width. We clamp it to a max size.
   SkScalar text_width = text_paint.measureText(text.c_str(), text.size());
   text_width = SkIntToScalar(
       std::min(kMaxTextWidth, SkScalarFloor(text_width)));
 
@@ skipping 44 matching lines @@
   // text was too large.
   rect.fLeft += kPadding;
   rect.fRight -= kPadding;
   canvas->clipRect(rect);
   canvas->drawText(text.c_str(), text.size(),
                    rect.fLeft + (rect.width() - text_width) / 2,
                    rect.fTop + kTextSize + 1,
                    text_paint);
   canvas->restore();
 }