diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 23:30:26 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-29 23:30:26 +0000 |
| commit | 5bc87e02c16ccf68c69bff890af32748dba95142 (patch) | |
| tree | 4733e9677e853fbd457f3afcc346fa72cf6a4776 /app | |
| parent | af34e6cd862c0ef241c66687e0f88ffccf2c9044 (diff) | |
| download | chromium_src-5bc87e02c16ccf68c69bff890af32748dba95142.zip chromium_src-5bc87e02c16ccf68c69bff890af32748dba95142.tar.gz chromium_src-5bc87e02c16ccf68c69bff890af32748dba95142.tar.bz2 | |
Fixes couple of bugs that occur now that we can actually run views on
gtk again.
BUG=none
TEST=none
TBR=ben
Review URL: http://codereview.chromium.org/115961
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/theme_provider.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/theme_provider.h b/app/theme_provider.h index 29ce2ce..c01842c 100644 --- a/app/theme_provider.h +++ b/app/theme_provider.h @@ -34,7 +34,7 @@ class ThemeProvider { // Get the color specified by |id|. virtual SkColor GetColor(int id) = 0; -#if defined(OS_LINUX) +#if defined(OS_LINUX) && !defined(TOOLKIT_VIEWS) // Gets the GdkPixbuf with the specified |id|. Returns a pointer to a shared // instance of the GdkPixbuf. This shared GdkPixbuf is owned by the theme // provider and should not be freed. |