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

chrome/browser/ui/views/tab_icon_view.h

Index: chrome/browser/ui/views/tab_icon_view.h
diff --git a/chrome/browser/ui/views/tab_icon_view.h b/chrome/browser/ui/views/tab_icon_view.h
index 27865991fef2a68563a748b7e5f8922c4159bc6d..101c6f2b682dd7edcb7550e910fc6defa52d5423 100644
--- a/chrome/browser/ui/views/tab_icon_view.h
+++ b/chrome/browser/ui/views/tab_icon_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.
 
@@ -40,13 +40,13 @@ class TabIconView : public views::View {
   void set_is_light(bool is_light) { is_light_ = is_light; }
 
   // Overridden from View
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
-  void PaintThrobber(gfx::Canvas* canvas);
-  void PaintFavicon(gfx::Canvas* canvas, const SkBitmap& bitmap);
-  void PaintIcon(gfx::Canvas* canvas,
+  void PaintThrobber(gfx::CanvasSkia* canvas);
+  void PaintFavicon(gfx::CanvasSkia* canvas, const SkBitmap& bitmap);
+  void PaintIcon(gfx::CanvasSkia* canvas,
                  const SkBitmap& bitmap,
                  int src_x,
                  int src_y,