[Extensions UI] Clean up extension icon generation

chrome/browser/extensions/extension_action.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/browser/extensions/extension_action.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/logging.h"
-#include "chrome/common/badge_util.h"
-#include "chrome/common/icon_with_badge_image_source.h"
 #include "extensions/browser/extension_icon_image.h"
 #include "extensions/browser/extension_icon_placeholder.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_icon_set.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest_handlers/icons_handler.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
@@ skipping 207 matching lines @@
   badge_text_.erase(tab_id);
   badge_text_color_.erase(tab_id);
   badge_background_color_.erase(tab_id);
   is_visible_.erase(tab_id);
   // TODO(jyasskin): Erase the element from declarative_show_count_
   // when the tab's closed.  There's a race between the
   // LocationBarController and the ContentRulesRegistry on navigation,
   // which prevents me from cleaning everything up now.
 }
 
-void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
-                                 const gfx::Rect& bounds,
-                                 int tab_id) {
-  badge_util::PaintBadge(
-      canvas,
-      bounds,
-      GetBadgeText(tab_id),
-      GetBadgeTextColor(tab_id),
-      GetBadgeBackgroundColor(tab_id),
-      GetIconWidth(tab_id),
-      action_type());
-}
-
-gfx::ImageSkia ExtensionAction::GetIconWithBadge(
-    const gfx::ImageSkia& icon,
-    int tab_id,
-    const gfx::Size& spacing) const {
-  if (tab_id < 0)
-    return icon;
-
-  return gfx::ImageSkia(
-      new IconWithBadgeImageSource(icon,
-                                   icon.size(),
-                                   spacing,
-                                   GetBadgeText(tab_id),
-                                   GetBadgeTextColor(tab_id),
-                                   GetBadgeBackgroundColor(tab_id),
-                                   action_type()),
-     icon.size());
-}
-
 extensions::IconImage* ExtensionAction::LoadDefaultIconImage(
     const extensions::Extension& extension,
     content::BrowserContext* browser_context) {
   if (default_icon_ && !default_icon_image_) {
     default_icon_image_.reset(new extensions::IconImage(
         browser_context,
         &extension,
         *default_icon(),
         GetIconSizeForType(action_type_),
         *GetDefaultIcon().ToImageSkia(),
@@ skipping 101 matching lines @@
   // If there is a default icon, the icon width will be set depending on our
   // action type.
   if (default_icon_)
     return GetIconSizeForType(action_type());
 
   // If no icon has been set and there is no default icon, we need favicon
   // width.
   return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
           IDR_EXTENSIONS_FAVICON).Width();
 }