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

chrome/browser/ui/views/dropdown_bar_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/dropdown_bar_view.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/generated_resources.h"
@@ skipping 92 matching lines @@
   animation_offset_ = offset;
   set_clip_insets(gfx::Insets(animation_offset_, 0, 0, 0));
 }
 
 // DropDownBarView, views::View overrides:
 void DropdownBarView::OnPaint(gfx::Canvas* canvas) {
   OnPaintBackground(canvas);
   OnPaintBorder(canvas);
 
   if (animation_offset() > 0) {
-     gfx::CanvasSkia animating_edges(
+     gfx::Canvas animating_edges(
          gfx::Size(bounds().width(), kAnimatingEdgeHeight), false);
      canvas->Translate(bounds().origin());
      OnPaintBackground(&animating_edges);
      OnPaintBorder(&animating_edges);
      canvas->DrawBitmapInt(animating_edges.ExtractBitmap(), bounds().x(),
          animation_offset());
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DropDownBarView, protected:
 
 void DropdownBarView::SetBackground(const SkBitmap* left_alpha_mask,
                                     const SkBitmap* right_alpha_mask) {
   set_background(new DropdownBackground(host()->browser_view(), left_alpha_mask,
       right_alpha_mask));
 }
 
 void DropdownBarView::SetBorder(int left_border_bitmap_id,
                                 int middle_border_bitmap_id,
                                 int right_border_bitmap_id) {
   int border_bitmap_ids[3] = {left_border_bitmap_id, middle_border_bitmap_id,
       right_border_bitmap_id};
   set_border(views::Border::CreateBorderPainter(
       new views::HorizontalPainter(border_bitmap_ids)));
 }