[Extensions UI] Clean up extension icon generation

chrome/browser/ui/toolbar/toolbar_action_view_controller.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTION_VIEW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTION_VIEW_CONTROLLER_H_
 
 #include "base/strings/string16.h"
 #include "ui/gfx/image/image.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace gfx {
-class Canvas;
-class Rect;
+class Size;
 }
 
 namespace ui {
 class MenuModel;
 }
 
 class ToolbarActionViewDelegate;
 
 // The basic controller class for an action that is shown on the toolbar -
 // an extension action (like browser actions) or a component action (like
 // chromecast).
 class ToolbarActionViewController {
  public:
   virtual ~ToolbarActionViewController() {}
 
   // Returns the unique ID of this particular action. For extensions, this is
   // the extension id; for component actions, this is the name of the component.
   virtual const std::string& GetId() const = 0;
 
   // 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.
   virtual base::string16 GetActionName() const = 0;
 
   // Returns the accessible name to use for the given |web_contents|.
   virtual base::string16 GetAccessibleName(content::WebContents* web_contents)
       const = 0;
 
   // Returns the tooltip to use for the given |web_contents|.
@@ skipping 31 matching lines @@
 
   // Executes the default action (which is typically showing the popup). If
   // |by_user| is true, then this was through a direct user action (as oppposed
   // to, e.g., an API call).
   // Returns true if a popup is shown.
   virtual bool ExecuteAction(bool by_user) = 0;
 
   // 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() {
   }
 };
 
 #endif  // CHROME_BROWSER_UI_TOOLBAR_TOOLBAR_ACTION_VIEW_CONTROLLER_H_