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_linux.cc | |
| 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_linux.cc')
| -rw-r--r-- | chrome/common/resource_bundle_linux.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/common/resource_bundle_linux.cc b/chrome/common/resource_bundle_linux.cc index e982db8..bad1da7 100644 --- a/chrome/common/resource_bundle_linux.cc +++ b/chrome/common/resource_bundle_linux.cc @@ -4,9 +4,7 @@ #include "chrome/common/resource_bundle.h" -#if defined(TOOLKIT_GTK) #include <gtk/gtk.h> -#endif #include "base/base_paths.h" #include "base/data_pack.h" @@ -25,7 +23,6 @@ namespace { -#if defined(TOOLKIT_GTK) // Convert the raw image data into a GdkPixbuf. The GdkPixbuf that is returned // has a ref count of 1 so the caller must call g_object_unref to free the // memory. @@ -51,7 +48,6 @@ GdkPixbuf* LoadPixbuf(std::vector<unsigned char>& data) { return pixbuf; } -#endif } // namespace @@ -163,7 +159,6 @@ string16 ResourceBundle::GetLocalizedString(int message_id) { return msg; } -#if defined(TOOLKIT_GTK) GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) { // Check to see if we already have the pixbuf in the cache. { @@ -212,4 +207,3 @@ GdkPixbuf* ResourceBundle::GetPixbufNamed(int resource_id) { return empty_bitmap; } } -#endif |