Canvas refactoring part 3....

chrome/browser/views/detachable_toolbar_view.cc

 // Copyright (c) 2009 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/views/detachable_toolbar_view.h"
 
 #include "app/resource_bundle.h"
 #include "chrome/browser/browser_theme_provider.h"
-#include "gfx/canvas.h"
+#include "gfx/canvas_skia.h"
 #include "gfx/skia_util.h"
 #include "grit/theme_resources.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkShader.h"
 
 // How round the 'new tab' style bookmarks bar is.
 static const int kNewtabBarRoundness = 5;
 
 const SkColor DetachableToolbarView::kEdgeDividerColor =
     SkColorSetRGB(222, 234, 248);
@@ skipping 43 matching lines @@
 }
 
 // static
 void DetachableToolbarView::PaintContentAreaBackground(
     gfx::Canvas* canvas, ThemeProvider* theme_provider,
     const SkRect& rect, double roundness) {
   SkPaint paint;
   paint.setAntiAlias(true);
   paint.setColor(theme_provider->GetColor(BrowserThemeProvider::COLOR_TOOLBAR));
 
-  canvas->drawRoundRect(
+  canvas->AsCanvasSkia()->drawRoundRect(
       rect, SkDoubleToScalar(roundness), SkDoubleToScalar(roundness), paint);
 }
 
 // static
 void DetachableToolbarView::PaintContentAreaBorder(
     gfx::Canvas* canvas, ThemeProvider* theme_provider,
     const SkRect& rect, double roundness) {
   SkPaint border_paint;
   border_paint.setColor(
       theme_provider->GetColor(BrowserThemeProvider::COLOR_NTP_HEADER));
   border_paint.setStyle(SkPaint::kStroke_Style);
   border_paint.setAlpha(96);
   border_paint.setAntiAlias(true);
 
-  canvas->drawRoundRect(rect,
-                        SkDoubleToScalar(roundness),
-                        SkDoubleToScalar(roundness), border_paint);
+  canvas->AsCanvasSkia()->drawRoundRect(
+      rect, SkDoubleToScalar(roundness), SkDoubleToScalar(roundness),
+      border_paint);
 }
 
 // static
 void DetachableToolbarView::PaintVerticalDivider(
     gfx::Canvas* canvas, int x, int height, int vertical_padding,
     const SkColor& top_color,
     const SkColor& middle_color,
     const SkColor& bottom_color) {
   // Draw the upper half of the divider.
   SkPaint paint;
   paint.setShader(gfx::CreateGradientShader(vertical_padding + 1,
                                             height / 2,
                                             top_color,
                                             middle_color))->safeUnref();
   SkRect rc = { SkIntToScalar(x),
                 SkIntToScalar(vertical_padding + 1),
                 SkIntToScalar(x + 1),
                 SkIntToScalar(height / 2) };
-  canvas->drawRect(rc, paint);
+  canvas->AsCanvasSkia()->drawRect(rc, paint);
 
   // Draw the lower half of the divider.
   SkPaint paint_down;
   paint_down.setShader(gfx::CreateGradientShader(height / 2,
                                                  height - vertical_padding,
                                                  middle_color,
                                                  bottom_color))->safeUnref();
   SkRect rc_down = { SkIntToScalar(x),
                      SkIntToScalar(height / 2),
                      SkIntToScalar(x + 1),
                      SkIntToScalar(height - vertical_padding) };
-  canvas->drawRect(rc_down, paint_down);
+  canvas->AsCanvasSkia()->drawRect(rc_down, paint_down);
 }