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

ash/app_list/app_list_item_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 ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
 #define ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_
 #pragma once
 
 #include "ash/app_list/app_list_item_model_observer.h"
 #include "ash/ash_export.h"
@@ skipping 29 matching lines @@
 
  protected:
   // AppListItemModelObserver overrides:
   virtual void ItemIconChanged() OVERRIDE;
   virtual void ItemTitleChanged() OVERRIDE;
 
   // views::View overrides:
   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_;
 
   views::ImageView* icon_;
   views::Label* title_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListItemView);
 };
 
 }  // namespace ash
 
 #endif  // ASH_APP_LIST_APP_LIST_ITEM_VIEW_H_