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

ui/views/controls/image_view.h

Index: ui/views/controls/image_view.h
diff --git a/ui/views/controls/image_view.h b/ui/views/controls/image_view.h
index 8827d4ecfc264dd3c395390d83ad45121bd38258..e15ea553ac806281afa3ec35e395761942d9cc76 100644
--- a/ui/views/controls/image_view.h
+++ b/ui/views/controls/image_view.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -10,7 +10,7 @@
 #include "ui/views/view.h"
 
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 }
 
 namespace views {
@@ -76,7 +76,7 @@ class VIEWS_EXPORT ImageView : public View {
 
   // Overriden from View
   virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual bool GetTooltipText(const gfx::Point& p,
                               string16* tooltip) const OVERRIDE;