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

ui/views/controls/progress_bar.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 "ui/views/controls/progress_bar.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/effects/SkBlurMaskFilter.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/accessibility/accessible_view_state.h"
-#include "ui/gfx/canvas_skia.h"
+#include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/insets.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/painter.h"
 
 namespace {
 
 // Corner radius for the progress bar's border.
@@ skipping 268 matching lines @@
   if (progress_width > 1) {
     FillRoundRect(canvas, 0, 0, progress_width, height(), kCornerRadius,
                   kBarColorStart, kBarColorEnd, false);
   }
   StrokeRoundRect(canvas, 0, 0, width(), height(), kCornerRadius,
                   kBorderColor, kBorderWidth);
 #endif
 }
 
 }  // namespace views