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

ash/app_list/app_list_item_view.h

Index: ash/app_list/app_list_item_view.h
diff --git a/ash/app_list/app_list_item_view.h b/ash/app_list/app_list_item_view.h
index c4ef19d1784855f6c55e498127a00c6696910945..f8a5a4ad3fab0bca9bd193bfae8d5c9e3399f4ac 100644
--- a/ash/app_list/app_list_item_view.h
+++ b/ash/app_list/app_list_item_view.h
@@ -47,7 +47,7 @@ class ASH_EXPORT AppListItemView : public views::CustomButton,
   virtual std::string GetClassName() const OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;

[Ben Goodger (Google), 2012/03/02 20:35:11]

This is the change I wanted you to avoid.

Since you have the typedef, this should not be necessary

[tfarina, 2012/03/02 20:57:21]

The forward declaration "class Canvas;" conflicts with the typedef declaration,
hence this is necessary.

 
  private:
   AppListItemModel* model_;