diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 15:09:39 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-10 15:09:39 +0000 |
| commit | 9146221ca83c4996713894316661b442b20c9e28 (patch) | |
| tree | 0cd1efb863d39a4ac44aacde045c957552e3da7d /chrome/common/resource_bundle_linux.cc | |
| parent | 98f5f88b53f774cee109503b0225a5bfb9deb550 (diff) | |
| download | chromium_src-9146221ca83c4996713894316661b442b20c9e28.zip chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.gz chromium_src-9146221ca83c4996713894316661b442b20c9e28.tar.bz2 | |
Adds some ifdefs so that test_shell can be compiled on linux
without GTK.
I had to recreate this patch as my workspace for various
resonds. UGH!
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/67024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/resource_bundle_linux.cc')
| -rw-r--r-- | chrome/common/resource_bundle_linux.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/resource_bundle_linux.cc b/chrome/common/resource_bundle_linux.cc index 0a5112f..009b5d3 100644 --- a/chrome/common/resource_bundle_linux.cc +++ b/chrome/common/resource_bundle_linux.cc @@ -4,7 +4,9 @@ #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" @@ -120,6 +122,7 @@ std::wstring ResourceBundle::GetLocalizedString(int message_id) { return UTF16ToWide(msg); } +#if defined(TOOLKIT_GTK) GdkPixbuf* ResourceBundle::LoadPixbuf(int resource_id) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); std::vector<unsigned char> data; @@ -143,3 +146,4 @@ GdkPixbuf* ResourceBundle::LoadPixbuf(int resource_id) { return pixbuf; } +#endif |