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

ui/views/window/dialog_client_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_DIALOG_CLIENT_VIEW_H_
 #define UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 #pragma once
 
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/focus/focus_manager.h"
@@ skipping 64 matching lines @@
   virtual const DialogClientView* AsDialogClientView() const OVERRIDE;
 
   // FocusChangeListener implementation:
   virtual void OnWillChangeFocus(View* focused_before,
                                  View* focused_now) OVERRIDE;
   virtual void OnDidChangeFocus(View* focused_before,
                                 View* focused_now) OVERRIDE;
 
  protected:
   // View overrides:
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
+  virtual void PaintChildren(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add, View* parent,
                                     View* child) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
 
   // ButtonListener implementation:
   virtual void ButtonPressed(Button* sender,
                              const views::Event& event) OVERRIDE;
 
  private:
   // Paint the size box in the bottom right corner of the window if it is
   // resizable.
-  void PaintSizeBox(gfx::Canvas* canvas);
+  void PaintSizeBox(gfx::CanvasSkia* canvas);
 
   // Returns the width of the specified dialog button using the correct font.
   int GetButtonWidth(int button) const;
   int GetButtonsHeight() const;
 
   // Position and size various sub-views.
   void LayoutDialogButtons();
   void LayoutContentsView();
 
   // Makes the specified button the default button.
@@ skipping 49 matching lines @@
 
   // Static resource initialization
   static gfx::Font* dialog_button_font_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_