diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 18:17:24 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-27 18:17:24 +0000 |
| commit | e5cd46b27d3591663ba43428e4b2e2249bf9733e (patch) | |
| tree | 0812842b1917d201e7610412d35d31c4d3c72c80 /chrome/common/resource_bundle.h | |
| parent | e1a853a919b8011cec35b1ba6eb170e16f56391c (diff) | |
| download | chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.zip chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.tar.gz chromium_src-e5cd46b27d3591663ba43428e4b2e2249bf9733e.tar.bz2 | |
More linux ifdef tweaks. This reverts my earlier change (13503).
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/100046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14628 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/resource_bundle.h')
| -rw-r--r-- | chrome/common/resource_bundle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/common/resource_bundle.h b/chrome/common/resource_bundle.h index 2532953..77cb88d 100644 --- a/chrome/common/resource_bundle.h +++ b/chrome/common/resource_bundle.h @@ -25,7 +25,7 @@ namespace base { class DataPack; }; #endif -#if defined(TOOLKIT_GTK) +#if defined(OS_LINUX) typedef struct _GdkPixbuf GdkPixbuf; #endif class ChromeFont; @@ -113,7 +113,7 @@ class ResourceBundle { // Loads and returns a cursor from the app module. HCURSOR LoadCursor(int cursor_id); -#elif defined(TOOLKIT_GTK) +#elif defined(OS_LINUX) // Gets the GdkPixbuf with the specified resource_id, first by looking into // the theme data, than in the current module data if applicable. Returns a // pointer to a shared instance of the GdkPixbuf. This shared GdkPixbuf is @@ -183,7 +183,7 @@ class ResourceBundle { // ownership of the pointers. typedef std::map<int, SkBitmap*> SkImageMap; SkImageMap skia_images_; -#if defined(TOOLKIT_GTK) +#if defined(OS_LINUX) typedef std::map<int, GdkPixbuf*> GdkPixbufMap; GdkPixbufMap gdk_pixbufs_; #endif |