diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-05 00:21:22 +0000 |
| commit | a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5 (patch) | |
| tree | 2cb114cfcd3d89203d045c56ec2af4d2d52cf9b0 /ui/gfx/image/image.h | |
| parent | b09be0a7dace2e86516a2661c9c504d640abed7c (diff) | |
| download | chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.zip chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.gz chromium_src-a13283ccd0eef981bd92b5ba3b78c7d1b4a678f5.tar.bz2 | |
Remove TOOLKIT_USES_GTK and consolidate it into TOOLKIT_GTK
Add gtk dependency to base.gyp for android host_os="linux" case
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9969080
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/image/image.h')
| -rw-r--r-- | ui/gfx/image/image.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ui/gfx/image/image.h b/ui/gfx/image/image.h index 3c2c05d..1878f49 100644 --- a/ui/gfx/image/image.h +++ b/ui/gfx/image/image.h @@ -38,7 +38,7 @@ class ImageMacTest; namespace gfx { -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) class CairoCachedSurface; #endif @@ -73,7 +73,7 @@ class UI_EXPORT Image { // of bitmaps, one for each resolution. explicit Image(const std::vector<const SkBitmap*>& bitmaps); -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) // Does not increase |pixbuf|'s reference count; expects to take ownership. explicit Image(GdkPixbuf* pixbuf); #elif defined(OS_MACOSX) @@ -97,7 +97,7 @@ class UI_EXPORT Image { // The returned result is a weak pointer owned by and scoped to the life of // the Image. const SkBitmap* ToSkBitmap() const; -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) GdkPixbuf* ToGdkPixbuf() const; CairoCachedSurface* const ToCairo() const; #elif defined(OS_MACOSX) @@ -111,7 +111,7 @@ class UI_EXPORT Image { // converted representations, rather than a limitation imposed by Image) and // so the result should be considered immutable. SkBitmap* CopySkBitmap() const; -#if defined(TOOLKIT_USES_GTK) +#if defined(TOOLKIT_GTK) GdkPixbuf* CopyGdkPixbuf() const; #elif defined(OS_MACOSX) NSImage* CopyNSImage() const; |