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

ui/views/controls/combobox/native_combobox_views.cc

 // 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.
 
 #include "ui/views/controls/combobox/native_combobox_views.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
@@ skipping 122 matching lines @@
     SchedulePaint();
   }
 
   return true;
 }
 
 bool NativeComboboxViews::OnKeyReleased(const views::KeyEvent& key_event) {
   return true;
 }
 
-void NativeComboboxViews::OnPaint(gfx::Canvas* canvas) {
+void NativeComboboxViews::OnPaint(gfx::CanvasSkia* canvas) {
   text_border_->set_has_focus(combobox_->HasFocus());
   OnPaintBackground(canvas);
   PaintText(canvas);
   OnPaintBorder(canvas);
 }
 
 void NativeComboboxViews::OnFocus() {
   NOTREACHED();
 }
 
@@ skipping 116 matching lines @@
 
 const gfx::Font& NativeComboboxViews::GetFont() const {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   return rb.GetFont(ResourceBundle::BaseFont);
 }
 
 void NativeComboboxViews::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(GetMirroredXForRect(*rect));
 }
 
-void NativeComboboxViews::PaintText(gfx::Canvas* canvas) {
+void NativeComboboxViews::PaintText(gfx::CanvasSkia* canvas) {
   gfx::Insets insets = GetInsets();
 
   canvas->Save();
   canvas->ClipRect(GetContentsBounds());
 
   int x = insets.left();
   int y = insets.top();
   int text_height = height() - insets.height();
   SkColor text_color = kTextColor;
 
@@ skipping 65 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeComboboxWrapper* NativeComboboxWrapper::CreateWrapper(
     Combobox* combobox) {
   return new NativeComboboxViews(combobox);
 }
 #endif
 
 }  // namespace views