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

ui/views/controls/image_view.h

-// 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.
 
 #ifndef UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
 #define UI_VIEWS_CONTROLS_IMAGE_VIEW_H_
 #pragma once
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/views/view.h"
 
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 }
 
 namespace views {
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // ImageView class.
 //
 // An ImageView can display an image from an SkBitmap. If a size is provided,
 // the ImageView will resize the provided image to fit if it is too big or will
@@ skipping 45 matching lines @@
   // Set / Get the vertical alignment.
   void SetVerticalAlignment(Alignment va);
   Alignment GetVerticalAlignment() const;
 
   // Set / Get the tooltip text.
   void SetTooltipText(const string16& tooltip);
   string16 GetTooltipText() const;
 
   // 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;
 
  private:
   // Compute the image origin given the desired size and the receiver alignment
   // properties.
   gfx::Point ComputeImageOrigin(const gfx::Size& image_size) const;
 
   // Whether the image size is set.
@@ skipping 13 matching lines @@
 
   // The current tooltip text.
   string16 tooltip_text_;
 
   DISALLOW_COPY_AND_ASSIGN(ImageView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_IMAGE_VIEW_H_