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

ui/views/controls/combobox/native_combobox_views.h

Index: ui/views/controls/combobox/native_combobox_views.h
diff --git a/ui/views/controls/combobox/native_combobox_views.h b/ui/views/controls/combobox/native_combobox_views.h
index e8dd165ab46dc87e1ddfb8e47179c2c870883424..c0da040866f9d2fa5f816e508c58f3e88e62ed96 100644
--- a/ui/views/controls/combobox/native_combobox_views.h
+++ b/ui/views/controls/combobox/native_combobox_views.h
@@ -11,7 +11,7 @@
 #include "ui/views/view.h"
 
 namespace gfx {
-class Canvas;
+class CanvasSkia;
 class Font;
 }
 
@@ -35,7 +35,7 @@ class NativeComboboxViews : public views::View,
   virtual bool OnMouseDragged(const views::MouseEvent& mouse_event) OVERRIDE;
   virtual bool OnKeyPressed(const views::KeyEvent& key_event) OVERRIDE;
   virtual bool OnKeyReleased(const views::KeyEvent& key_event) OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaint(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
 
@@ -72,7 +72,7 @@ class NativeComboboxViews : public views::View,
   void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
 
   // Draw the selected value of the drop down list
-  void PaintText(gfx::Canvas* canvas);
+  void PaintText(gfx::CanvasSkia* canvas);
 
   // Show the drop down list
   void ShowDropDownMenu();