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

ui/views/controls/combobox/combobox.h

Index: ui/views/controls/combobox/combobox.h
diff --git a/ui/views/controls/combobox/combobox.h b/ui/views/controls/combobox/combobox.h
index a6f7e351613bd692a52343d49eace92951fe902d..438734146a535fd2c0a7a93d6afd8522c624c51a 100644
--- a/ui/views/controls/combobox/combobox.h
+++ b/ui/views/controls/combobox/combobox.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -64,7 +64,7 @@ class VIEWS_EXPORT Combobox : public View {
   virtual void Layout() OVERRIDE;
   virtual void OnEnabledChanged() OVERRIDE;
   virtual bool SkipDefaultKeyEventProcessing(const KeyEvent& e) OVERRIDE;
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
+  virtual void OnPaintFocusBorder(gfx::CanvasSkia* canvas) OVERRIDE;
   virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE;
   virtual bool OnKeyReleased(const views::KeyEvent& e) OVERRIDE;
   virtual void OnFocus() OVERRIDE;