Move ScriptBadge, ActionInfo out of Extension; preparation for BrowserAction

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 "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
@@ skipping 127 matching lines @@
   // Return the generated image.
   return canvas->ExtractImageRep().sk_bitmap();
 }
 
 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::Extension::ActionInfo::Type action_type) {
+                extensions::ActionInfo::Type action_type) {
   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 14 matching lines @@
   // 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::Extension::ActionInfo::TYPE_BROWSER ?
+      action_type == extensions::ActionInfo::TYPE_BROWSER ?
       kBottomMarginBrowserAction : kBottomMarginPageAction;
   int rect_y = bounds.bottom() - bottom_margin - 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);
@@ skipping 26 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