Revert 50784 - Canvas refactoring part 3....

views/background.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 "views/background.h"
 
 #include "base/logging.h"
-#include "gfx/canvas_skia.h"
+#include "gfx/canvas.h"
 #include "gfx/color_utils.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "views/painter.h"
 #include "views/view.h"
 
 namespace views {
 
 // SolidBackground is a trivial Background implementation that fills the
 // background in a solid color.
 class SolidBackground : public Background {
  public:
   explicit SolidBackground(const SkColor& color) {
     SetNativeControlColor(color);
   }
 
   void Paint(gfx::Canvas* canvas, View* view) const {
     // Fill the background. Note that we don't constrain to the bounds as
     // canvas is already clipped for us.
-    canvas->AsCanvasSkia()->drawColor(get_color());
+    canvas->drawColor(get_color());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SolidBackground);
 };
 
 class BackgroundPainter : public Background {
  public:
   BackgroundPainter(bool owns_painter, Painter* painter)
       : owns_painter_(owns_painter), painter_(painter) {
@@ skipping 62 matching lines @@
     return background;
 }
 
 //static
 Background* Background::CreateBackgroundPainter(bool owns_painter,
                                                 Painter* painter) {
   return new BackgroundPainter(owns_painter, painter);
 }
 
 }  // namespace views