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.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.cc')
| -rw-r--r-- | chrome/common/resource_bundle.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc index 3ffc026..f87560d 100644 --- a/chrome/common/resource_bundle.cc +++ b/chrome/common/resource_bundle.cc @@ -52,7 +52,9 @@ void ResourceBundle::FreeImages() { } void ResourceBundle::SetThemeExtension(const Extension& e) { +#if !defined(LINUX2) theme_extension_.reset(new Extension(e)); +#endif } /* static */ @@ -63,6 +65,7 @@ SkBitmap* ResourceBundle::LoadBitmap(DataHandle data_handle, int resource_id) { // it can handle this resource. // TODO(erikkay): It would be nice to use something less brittle than // resource_id here. +#if !defined(LINUX2) if (g_shared_instance_->theme_extension_.get()) { FilePath path = g_shared_instance_->theme_extension_->GetThemeResourcePath(resource_id); @@ -84,6 +87,7 @@ SkBitmap* ResourceBundle::LoadBitmap(DataHandle data_handle, int resource_id) { } } } +#endif if (!success) success = LoadResourceBytes(data_handle, resource_id, &raw_data); if (!success) |