Convert extension action icons code to use ImageSkia instead of SkBitmap

chrome/browser/ui/views/browser_action_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_
 
 #include <string>
 
 #include "chrome/browser/extensions/image_loading_tracker.h"
@@ skipping 46 matching lines @@
     virtual ~Delegate() {}
   };
 
   BrowserActionView(const extensions::Extension* extension,
                     Browser* browser,
                     Delegate* delegate);
   virtual ~BrowserActionView();
 
   BrowserActionButton* button() { return button_; }
 
-  // Allocates a canvas object on the heap and draws into it the icon for the
-  // view as well as the badge (if any). Caller is responsible for deleting the
-  // returned object.
-  gfx::Canvas* GetIconWithBadge();
+  // Gets browser action button icon with the badge.
+  gfx::ImageSkia GetIconWithBadge();
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  protected:
   // Overridden from views::View to paint the badge on top of children.
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
@@ skipping 139 matching lines @@
 
   // Responsible for running the menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   friend class base::DeleteHelper<BrowserActionButton>;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserActionButton);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_BROWSER_ACTION_VIEW_H_