diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 21:24:25 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 21:24:25 +0000 |
| commit | 0e935c74fd6ca38866df63af66dc535497172950 (patch) | |
| tree | 675c767909ac2ac6f140d01407606db7193d591d /ui/gfx/canvas_skia.cc | |
| parent | bae2bd6410e24c06c64a304bb4be294e835bfb41 (diff) | |
| download | chromium_src-0e935c74fd6ca38866df63af66dc535497172950.zip chromium_src-0e935c74fd6ca38866df63af66dc535497172950.tar.gz chromium_src-0e935c74fd6ca38866df63af66dc535497172950.tar.bz2 | |
Create a new views_aura_desktop.
Get views::Widget rendering working against an aura::Window NativeWidget.
http://crbug.com/93944
TEST=none
Review URL: http://codereview.chromium.org/7741027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98306 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/canvas_skia.cc')
| -rw-r--r-- | ui/gfx/canvas_skia.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/gfx/canvas_skia.cc b/ui/gfx/canvas_skia.cc index 160ca94..9083d1d 100644 --- a/ui/gfx/canvas_skia.cc +++ b/ui/gfx/canvas_skia.cc @@ -366,7 +366,7 @@ Canvas* Canvas::CreateCanvas(int width, int height, bool is_opaque) { return new CanvasSkia(width, height, is_opaque); } -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) // TODO(beng): move to canvas_win.cc, etc. class CanvasPaintWin : public CanvasSkiaPaint, public CanvasPaint { public: @@ -388,7 +388,7 @@ class CanvasPaintWin : public CanvasSkiaPaint, public CanvasPaint { #endif CanvasPaint* CanvasPaint::CreateCanvasPaint(gfx::NativeView view) { -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(USE_AURA) return new CanvasPaintWin(view); #else return NULL; |