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

chrome/browser/ui/views/detachable_toolbar_view.h

Index: chrome/browser/ui/views/detachable_toolbar_view.h
diff --git a/chrome/browser/ui/views/detachable_toolbar_view.h b/chrome/browser/ui/views/detachable_toolbar_view.h
index 9def6913ff1a2d8aaba11ec040ea4321fdd7fb30..e3cab1e6f8954d7b2903389b4246d41303da7e29 100644
--- a/chrome/browser/ui/views/detachable_toolbar_view.h
+++ b/chrome/browser/ui/views/detachable_toolbar_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.
 
@@ -34,7 +34,7 @@ class DetachableToolbarView : public views::AccessiblePaneView {
   // Paints the background (including the theme image behind content area) when
   // the bar/shelf is attached to the top toolbar.  |background_origin| is the
   // origin to use for painting the theme image.
-  static void PaintBackgroundAttachedMode(gfx::Canvas* canvas,
+  static void PaintBackgroundAttachedMode(gfx::CanvasSkia* canvas,
                                           views::View* view,
                                           const gfx::Point& background_origin);
 
@@ -52,18 +52,18 @@ class DetachableToolbarView : public views::AccessiblePaneView {
                                    views::View* view);
 
   // Paint the horizontal border separating the shelf/bar from the page content.
-  static void PaintHorizontalBorder(gfx::Canvas* canvas,
+  static void PaintHorizontalBorder(gfx::CanvasSkia* canvas,
                                     DetachableToolbarView* view);
 
   // Paint the background of the content area (the surface behind the
   // bookmarks). |rect| is the rectangle to paint the background within.
   // |roundness| describes the roundness of the corners.
-  static void PaintContentAreaBackground(gfx::Canvas* canvas,
+  static void PaintContentAreaBackground(gfx::CanvasSkia* canvas,
                                          ui::ThemeProvider* theme_provider,
                                          const SkRect& rect,
                                          double roundness);
   // Paint the border around the content area (when in detached mode).
-  static void PaintContentAreaBorder(gfx::Canvas* canvas,
+  static void PaintContentAreaBorder(gfx::CanvasSkia* canvas,
                                      ui::ThemeProvider* theme_provider,
                                      const SkRect& rect,
                                      double roundness);
@@ -75,7 +75,7 @@ class DetachableToolbarView : public views::AccessiblePaneView {
   // The color of the divider is a gradient starting with |top_color| at the
   // top, and changing into |middle_color| and then over to |bottom_color| as
   // you go further down.
-  static void PaintVerticalDivider(gfx::Canvas* canvas,
+  static void PaintVerticalDivider(gfx::CanvasSkia* canvas,
                                    int x,
                                    int height,
                                    int vertical_padding,