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

ui/views/window/custom_frame_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_WINDOW_CUSTOM_FRAME_VIEW_H_
 #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
 #pragma once
 
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 class SkBitmap;
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 class Font;
 class Size;
 class Path;
 class Point;
 }
 
 namespace views {
 
 class FrameBackground;
 
@@ skipping 15 matching lines @@
   virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const OVERRIDE;
   virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
   virtual void GetWindowMask(const gfx::Size& size, gfx::Path* window_mask)
       OVERRIDE;
   virtual void ResetWindowControls() OVERRIDE;
   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;
 
   // ButtonListener implementation:
   virtual void ButtonPressed(Button* sender, const views::Event& event)
       OVERRIDE;
 
  private:
   // Returns the thickness of the border that makes up the window frame edges.
   // This does not include any client edge.
@@ skipping 20 matching lines @@
 
   // Returns the bounds of the titlebar icon (or where the icon would be if
   // there was one).
   gfx::Rect IconBounds() const;
 
   // Returns true if the client edge should be drawn. This is true if
   // the window delegate wants a client edge and we are not maxmized.
   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;
   SkBitmap* GetFrameBitmap() const;
 
   // Layout various sub-components of this view.
   void LayoutWindowControls();
   void LayoutTitleBar();
   void LayoutClientView();
 
@@ skipping 21 matching lines @@
   // Initialize various static resources.
   static void InitClass();
   static gfx::Font* title_font_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomFrameView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_