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

ui/views/window/custom_frame_view.h

Index: ui/views/window/custom_frame_view.h
diff --git a/ui/views/window/custom_frame_view.h b/ui/views/window/custom_frame_view.h
index b71c451a9cae647438cd5f3127bb83ffd28875f6..2567db15ddc19354e4b2e7aad788a60eb3fe6cd1 100644
--- a/ui/views/window/custom_frame_view.h
+++ b/ui/views/window/custom_frame_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.
 
@@ -12,7 +12,7 @@
 
 class SkBitmap;
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 class Font;
 class Size;
 class Path;
@@ -48,7 +48,7 @@ class CustomFrameView : public NonClientFrameView,
   virtual void UpdateWindowIcon() OVERRIDE;
 
   // View overrides:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
@@ -89,10 +89,10 @@ class CustomFrameView : public NonClientFrameView,
   bool ShouldShowClientEdge() const;
 
   // Paint various sub-components of this view.
-  void PaintRestoredFrameBorder(gfx::Canvas* canvas);
-  void PaintMaximizedFrameBorder(gfx::Canvas* canvas);
-  void PaintTitleBar(gfx::Canvas* canvas);
-  void PaintRestoredClientEdge(gfx::Canvas* canvas);
+  void PaintRestoredFrameBorder(gfx::CanvasSkia* canvas);
+  void PaintMaximizedFrameBorder(gfx::CanvasSkia* canvas);
+  void PaintTitleBar(gfx::CanvasSkia* canvas);
+  void PaintRestoredClientEdge(gfx::CanvasSkia* canvas);
 
   // Compute aspects of the frame needed to paint the frame background.
   SkColor GetFrameColor() const;