[Extensions UI] Clean up extension icon generation

chrome/browser/extensions/extension_action.cc

Index: chrome/browser/extensions/extension_action.cc
diff --git a/chrome/browser/extensions/extension_action.cc b/chrome/browser/extensions/extension_action.cc
index 312633d586034ee11790c527b6cc31e251585271..af9e8685934c872f5e0e5b4aa3cdab328156bc93 100644
--- a/chrome/browser/extensions/extension_action.cc
+++ b/chrome/browser/extensions/extension_action.cc
@@ -8,8 +8,6 @@
 
 #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"
@@ -237,37 +235,6 @@ void ExtensionAction::ClearAllValuesForTab(int tab_id) {
   // 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) {