Revert 98306 - Create a new views_aura_desktop.

ui/gfx/canvas_skia.cc

 // Copyright (c) 2011 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/gfx/canvas_skia.h"
 
 #include <limits>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 348 matching lines @@
 // Canvas, public:
 
 Canvas* Canvas::CreateCanvas() {
   return new CanvasSkia;
 }
 
 Canvas* Canvas::CreateCanvas(int width, int height, bool is_opaque) {
   return new CanvasSkia(width, height, is_opaque);
 }
 
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
 // TODO(beng): move to canvas_win.cc, etc.
 class CanvasPaintWin : public CanvasSkiaPaint, public CanvasPaint {
  public:
   CanvasPaintWin(gfx::NativeView view) : CanvasSkiaPaint(view) {}
 
   // Overridden from CanvasPaint2:
   virtual bool IsValid() const {
     return isEmpty();
   }
 
   virtual gfx::Rect GetInvalidRect() const {
     return gfx::Rect(paintStruct().rcPaint);
   }
 
   virtual Canvas* AsCanvas() {
     return this;
   }
 };
 #endif
 
 CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) {
-#if defined(OS_WIN) && !defined(USE_AURA)
+#if defined(OS_WIN)
   return new CanvasPaintWin(view);
 #else
   return NULL;
 #endif
 }
 
 }  // namespace gfx