| Index: chrome/common/resource_bundle.cc
|
| diff --git a/chrome/common/resource_bundle.cc b/chrome/common/resource_bundle.cc
|
| index 785dd299f2eff7734d22dac12b096f9ecba63b89..69318fd321cf62e0532da6bd49c809119d942066 100644
|
| --- a/chrome/common/resource_bundle.cc
|
| +++ b/chrome/common/resource_bundle.cc
|
| @@ -85,6 +85,7 @@ bool ResourceBundle::LoadDataResourceBytes(int resource_id,
|
| }
|
|
|
| SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
|
| +#if defined(OS_WIN)
|
| // Check to see if we already have the Skia image in the cache.
|
| {
|
| AutoLock lock_scope(lock_);
|
| @@ -114,10 +115,17 @@ SkBitmap* ResourceBundle::GetBitmapNamed(int resource_id) {
|
| return bitmap.release();
|
| }
|
|
|
| +#else
|
| + NOTIMPLEMENTED() << "image resource loading disabled; need data files";
|
| +#endif
|
| // We failed to retrieve the bitmap, show a debugging red square.
|
| {
|
| LOG(WARNING) << "Unable to load bitmap with id " << resource_id;
|
| +#if defined(OS_WIN)
|
| NOTREACHED(); // Want to assert in debug mode.
|
| +#else
|
| + // TODO(port): remove this exception
|
| +#endif
|
|
|
| AutoLock lock_scope(lock_); // Guard empty_bitmap initialization.
|
|
|
|
|