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

ui/views/controls/combobox/combobox.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/combobox.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/keycodes/keyboard_codes.h"
@@ skipping 74 matching lines @@
 // VKEY_ESCAPE should be handled by this view when the drop down list is active.
 // In other words, the list should be closed instead of the dialog.
 bool Combobox::SkipDefaultKeyEventProcessing(const KeyEvent& e) {
   if (e.key_code() != ui::VKEY_ESCAPE ||
       e.IsShiftDown() || e.IsControlDown() || e.IsAltDown()) {
     return false;
   }
   return native_wrapper_ && native_wrapper_->IsDropdownOpen();
 }
 
-void Combobox::OnPaintFocusBorder(gfx::Canvas* canvas) {
+void Combobox::OnPaintFocusBorder(gfx::CanvasSkia* canvas) {
   if (NativeViewHost::kRenderNativeControlFocus)
     View::OnPaintFocusBorder(canvas);
 }
 
 bool Combobox::OnKeyPressed(const views::KeyEvent& e) {
   return native_wrapper_ && native_wrapper_->HandleKeyPressed(e);
 }
 
 bool Combobox::OnKeyReleased(const views::KeyEvent& e) {
   return native_wrapper_ && native_wrapper_->HandleKeyReleased(e);
@@ skipping 34 matching lines @@
     native_wrapper_->UpdateSelectedItem();
     native_wrapper_->UpdateEnabled();
   }
 }
 
 std::string Combobox::GetClassName() const {
   return kViewClassName;
 }
 
 }  // namespace views