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

ui/views/controls/tabbed_pane/native_tabbed_pane_views.cc

-// 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.
 
 #include "ui/views/controls/tabbed_pane/native_tabbed_pane_views.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
@@ skipping 59 matching lines @@
                           0, 0,
                           0, 0 };
     path.addRoundRect(bounds, radii, SkPath::kCW_Direction);
 
     SkPaint paint;
     paint.setAntiAlias(true);
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setColor(kTabBorderColor);
     paint.setStrokeWidth(kTabBorderThickness * 2);
 
-    canvas->AsCanvasSkia()->sk_canvas()->drawPath(path, paint);
+    canvas->sk_canvas()->drawPath(path, paint);
   }
 
   void PaintTabTitle(gfx::Canvas* canvas, bool selected) {
     int text_width = GetTabTitleFont().GetStringWidth(title_);
     int text_height = GetTabTitleFont().GetHeight();
     int text_x = (width() - text_width) / 2;
     int text_y = 5;
     gfx::Rect text_rect(text_x, text_y, text_width, text_height);
     canvas->DrawStringInt(title_, GetTabTitleFont(), title_color_, text_rect);
   }
@@ skipping 63 matching lines @@
       child_at(i)->SetBounds(x, 0, ps.width(), ps.height());
       x = child_at(i)->bounds().right();
     }
   }
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     SkPaint paint;
     paint.setColor(kTabBorderColor);
     paint.setStrokeWidth(kTabBorderThickness);
     SkScalar line_y = SkIntToScalar(height()) - kTabBorderThickness;
     SkScalar line_width = SkIntToScalar(width());
-    canvas->AsCanvasSkia()->sk_canvas()->drawLine(0, line_y, line_width, line_y,
-                                                  paint);
+    canvas->sk_canvas()->drawLine(0, line_y, line_width, line_y, paint);
   }
 
  private:
   NativeTabbedPaneViews* owner_;
   View* selected_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStrip);
 };
 
 void Tab::OnSelectedStateChanged(bool selected) {
@@ skipping 224 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTabbedPaneWrapper, public:
 
 // static
 NativeTabbedPaneWrapper* NativeTabbedPaneWrapper::CreateNativeWrapper(
     TabbedPane* tabbed_pane) {
   return new NativeTabbedPaneViews(tabbed_pane);
 }
 
 }  // namespace views