[Extensions UI] Clean up extension icon generation

chrome/common/badge_util.cc

 // Copyright (c) 2012 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 "chrome/common/badge_util.h"
 
 #include <cmath>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkTypeface.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/resources/grit/ui_resources.h"
 
 namespace {
 
 // Different platforms need slightly different constants to look good.
+// TODO(devlin): Comb through these and see if they are all still needed/
+// appropriate.
 #if defined(OS_WIN)
 const float kTextSize = 10;
-const int kBottomMarginBrowserAction = 0;
-const int kBottomMarginPageAction = 2;
-const int kPadding = 2;
 // The padding between the top of the badge and the top of the text.
 const int kTopTextPadding = -1;
 #elif defined(OS_MACOSX)
 const float kTextSize = 9.0;
-const int kBottomMarginBrowserAction = 5;
-const int kBottomMarginPageAction = 2;
-const int kPadding = 2;
 const int kTopTextPadding = 0;
 #elif defined(OS_CHROMEOS)
 const float kTextSize = 8.0;
-const int kBottomMarginBrowserAction = 0;
-const int kBottomMarginPageAction = 2;
-const int kPadding = 2;
 const int kTopTextPadding = 1;
 #elif defined(OS_POSIX)
 const float kTextSize = 9.0;
-const int kBottomMarginBrowserAction = 0;
-const int kBottomMarginPageAction = 2;
-const int kPadding = 2;
 const int kTopTextPadding = 0;
 #endif
 
+const int kPadding = 2;
 const int kBadgeHeight = 11;
 const int kMaxTextWidth = 23;
 
 // The minimum width for center-aligning the badge.
 const int kCenterAlignThreshold = 20;
 
 }  // namespace
 
 namespace badge_util {
 
@@ skipping 32 matching lines @@
     // |text_paint| adds its own ref. Release the ref from CreateFontName.
   }
   return text_paint;
 }
 
 void PaintBadge(gfx::Canvas* canvas,
                 const gfx::Rect& bounds,
                 const std::string& text,
                 const SkColor& text_color_in,
                 const SkColor& background_color_in,
-                int icon_width,
-                extensions::ActionInfo::Type action_type) {
+                int icon_width) {
   if (text.empty())
     return;
 
   SkColor text_color = text_color_in;
   if (SkColorGetA(text_color_in) == 0x00)
     text_color = SK_ColorWHITE;
 
   SkColor background_color = background_color_in;
   if (SkColorGetA(background_color_in) == 0x00)
       background_color = SkColorSetARGB(255, 218, 0, 24);
@@ skipping 25 matching lines @@
   int badge_width = text_width + kPadding * 2;
   // Force the pixel width of badge to be either odd (if the icon width is odd)
   // or even otherwise. If there is a mismatch you get http://crbug.com/26400.
   if (icon_width != 0 && (badge_width % 2 != icon_width % 2))
     badge_width += 1;
   badge_width = std::max(kBadgeHeight, badge_width);
 
   // Paint the badge background color in the right location. It is usually
   // right-aligned, but it can also be center-aligned if it is large.
   int rect_height = kBadgeHeight;
-  int bottom_margin =
-      action_type == extensions::ActionInfo::TYPE_BROWSER ?
-      kBottomMarginBrowserAction : kBottomMarginPageAction;
-  int rect_y = bounds.bottom() - bottom_margin - kBadgeHeight;
+  int rect_y = bounds.bottom() - kBadgeHeight;
   int rect_width = badge_width;
   int rect_x = (badge_width >= kCenterAlignThreshold) ?
       bounds.x() + (bounds.width() - badge_width) / 2 :
       bounds.right() - badge_width;
   gfx::Rect rect(rect_x, rect_y, rect_width, rect_height);
 
   SkPaint rect_paint;
   rect_paint.setStyle(SkPaint::kFill_Style);
   rect_paint.setAntiAlias(true);
   rect_paint.setColor(background_color);
@@ skipping 24 matching lines @@
   canvas->sk_canvas()->drawText(
       text.c_str(), text.size(),
       SkFloatToScalar(rect.x() +
                       static_cast<float>(rect.width() - text_width) / 2),
       SkFloatToScalar(rect.y() + kTextSize + kTopTextPadding),
       *text_paint);
   canvas->Restore();
 }
 
 }  // namespace badge_util