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

chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.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 "chrome/browser/ui/views/autocomplete/touch_autocomplete_popup_contents_view.h"
 
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
@@ skipping 64 matching lines @@
   double child_width =
       static_cast<double>(bounds.width()) / visible_children.size();
   int x = bounds.x();
   for (size_t i = 0; i < visible_children.size(); ++i) {
     int next_x = bounds.x() + static_cast<int>(((i + 1) * child_width) + 0.5);
     visible_children[i]->SetBounds(x, bounds.y(), next_x - x, bounds.height());
     x = next_x;
   }
 }
 
-void TouchAutocompletePopupContentsView::PaintResultViews(
-    gfx::CanvasSkia* canvas) {
+void TouchAutocompletePopupContentsView::PaintResultViews(gfx::Canvas* canvas) {
   AutocompletePopupContentsView::PaintResultViews(canvas);
 
   // Draw divider lines.
   std::vector<View*> visible_children(GetVisibleChildren());
   if (visible_children.size() < 2)
     return;
   SkColor color = AutocompleteResultView::GetColor(
       AutocompleteResultView::NORMAL, AutocompleteResultView::DIMMED_TEXT);
   gfx::Rect bounds(GetContentsBounds());
   for (std::vector<View*>::const_iterator i(visible_children.begin() + 1);
@@ skipping 26 matching lines @@
 std::vector<views::View*>
     TouchAutocompletePopupContentsView::GetVisibleChildren() {
   std::vector<View*> visible_children;
   for (int i = 0; i < child_count(); ++i) {
     View* v = child_at(i);
     if (child_at(i)->visible())
       visible_children.push_back(v);
   }
   return visible_children;
 }