Revert 50784 - Canvas refactoring part 3....

views/controls/progress_bar.cc

 // Copyright (c) 2010 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 "views/controls/progress_bar.h"
 
 #include <string>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string_util.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "gfx/font.h"
 #include "gfx/insets.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "views/background.h"
 #include "views/border.h"
 #include "views/painter.h"
 
 namespace {
@@ skipping 44 matching lines @@
     }
     SkColor colors[2] = { gradient_start_color, gradient_end_color };
     SkShader* s = SkGradientShader::CreateLinear(
         p, colors, NULL, 2, SkShader::kClamp_TileMode, NULL);
     paint.setShader(s);
     // Need to unref shader, otherwise never deleted.
     s->unref();
   } else {
     paint.setColor(gradient_start_color);
   }
-  canvas->AsCanvasSkia()->drawPath(path, paint);
+  canvas->drawPath(path, paint);
 }
 
 static void StrokeRoundRect(gfx::Canvas* canvas,
                             int x, int y,
                             int w, int h,
                             int corner_radius,
                             SkColor stroke_color,
                             int stroke_width) {
   SkPath path;
   AddRoundRectPath(x, y, w, h, corner_radius, &path);
   SkPaint paint;
   paint.setShader(NULL);
   paint.setColor(stroke_color);
   paint.setStyle(SkPaint::kStroke_Style);
   paint.setFlags(SkPaint::kAntiAlias_Flag);
   paint.setStrokeWidth(SkIntToScalar(stroke_width));
-  canvas->AsCanvasSkia()->drawPath(path, paint);
+  canvas->drawPath(path, paint);
 }
 
 }  // anonymous namespace
 
 namespace views {
 
 // static
 const char ProgressBar::kViewClassName[] = "views/ProgressBar";
 // static: progress bar's maximum value.
 const int ProgressBar::kMaxProgress = 100;
@@ skipping 85 matching lines @@
   return true;
 }
 
 bool ProgressBar::GetAccessibleState(AccessibilityTypes::State* state) {
   DCHECK(state);
   *state = AccessibilityTypes::STATE_READONLY;
   return true;
 }
 
 }  // namespace views