diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 20:00:51 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-23 20:00:51 +0000 |
| commit | 0ce348504238ae1aeb7e2555ea21301b0a428214 (patch) | |
| tree | 78233e6177f0866f626b71fe59350bb1cfef6935 /skia/ext/canvas_paint.h | |
| parent | 376a47639b68b58ab469716890573d360d2e358a (diff) | |
| download | chromium_src-0ce348504238ae1aeb7e2555ea21301b0a428214.zip chromium_src-0ce348504238ae1aeb7e2555ea21301b0a428214.tar.gz chromium_src-0ce348504238ae1aeb7e2555ea21301b0a428214.tar.bz2 | |
Fixed some chrome aura build problems
- Removed default_plugin from aura build
- Added new canvas_paint_x and renamed canvas_paint_linux to canvas_paint_gtk
BUG=97131
TEST=none
Review URL: http://codereview.chromium.org/8015012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/canvas_paint.h')
| -rw-r--r-- | skia/ext/canvas_paint.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/skia/ext/canvas_paint.h b/skia/ext/canvas_paint.h index 87118bd..051463f 100644 --- a/skia/ext/canvas_paint.h +++ b/skia/ext/canvas_paint.h @@ -16,8 +16,10 @@ #elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__sun) #if defined(USE_WAYLAND) #include "skia/ext/canvas_paint_wayland.h" +#elif defined(TOOLKIT_USES_GTK) +#include "skia/ext/canvas_paint_gtk.h" #else -#include "skia/ext/canvas_paint_linux.h" +#include "skia/ext/canvas_paint_x.h" #endif #endif |