ui/gfx: Make gfx::Canvas inherit from gfx::CanvasSkia.

chrome/browser/ui/views/browser_actions_container.h

Index: chrome/browser/ui/views/browser_actions_container.h
diff --git a/chrome/browser/ui/views/browser_actions_container.h b/chrome/browser/ui/views/browser_actions_container.h
index cb20e3ac4a67768a993113b13c7917a3faa6ffe2..209eedd7bbf9dd37ada2d3c286eaf21a1eecd246 100644
--- a/chrome/browser/ui/views/browser_actions_container.h
+++ b/chrome/browser/ui/views/browser_actions_container.h
@@ -171,7 +171,7 @@ class BrowserActionView : public views::View {
   // 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();
+  gfx::CanvasSkia* GetIconWithBadge();
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;
@@ -179,7 +179,7 @@ class BrowserActionView : public views::View {
 
  protected:
   // Overridden from views::View to paint the badge on top of children.
-  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
+  virtual void PaintChildren(gfx::CanvasSkia* canvas) OVERRIDE;
 
  private:
   // The container for this view.
@@ -397,7 +397,7 @@ class BrowserActionsContainer
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child) OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual void OnThemeChanged() OVERRIDE;
 
  private: