[Extensions UI] Clean up extension icon generation

chrome/browser/ui/toolbar/toolbar_action_view_controller.h

Index: chrome/browser/ui/toolbar/toolbar_action_view_controller.h
diff --git a/chrome/browser/ui/toolbar/toolbar_action_view_controller.h b/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
index cc0c832a25d5156c7834c6852bf2c25547add27d..5dba746575b466bcbef40e2689ce2a7a8364e666 100644
--- a/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
+++ b/chrome/browser/ui/toolbar/toolbar_action_view_controller.h
@@ -13,8 +13,7 @@ class WebContents;
 }
 
 namespace gfx {
-class Canvas;
-class Rect;
+class Size;
 }
 
 namespace ui {
@@ -37,11 +36,9 @@ class ToolbarActionViewController {
   // Sets the view delegate, which can handle most of the front-end logic.
   virtual void SetDelegate(ToolbarActionViewDelegate* delegate) = 0;
 
-  // Returns the icon to use for the given |web_contents|.
-  virtual gfx::Image GetIcon(content::WebContents* web_contents) = 0;
-
-  // Returns the icon and the badge, if any, for the current tab.
-  virtual gfx::ImageSkia GetIconWithBadge() = 0;
+  // Returns the icon to use for the given |web_contents| and |size|.
+  virtual gfx::Image GetIcon(content::WebContents* web_contents,
+                             const gfx::Size& size) = 0;
 
   // Returns the name of the action, which can be separate from the accessible
   // name or name for the tooltip.
@@ -93,12 +90,6 @@ class ToolbarActionViewController {
   // Updates the current state of the action.
   virtual void UpdateState() = 0;
 
-  // Paints any extra parts of the image (e.g., a badge).
-  virtual void PaintExtra(gfx::Canvas* canvas,
-                          const gfx::Rect& bounds,
-                          content::WebContents* web_contents) const {
-  }
-
   // Registers an accelerator. Called when the view is added to the hierarchy.
   // Unregistering any commands is the responsibility of the controller.
   virtual void RegisterCommand() {