Add Check() to better diagnose www.crbug.com/159941
In icon_loader_mac.mm, if loading image failed, set |image_| to Null.
BUG=159941
Test=None
R=rsesek
TBR=thakis
Review URL: https://chromiumcodereview.appspot.com/11362148
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167567 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/icon_loader_mac.mm b/chrome/browser/icon_loader_mac.mm
index 7313a69..62bf1fe9 100644
--- a/chrome/browser/icon_loader_mac.mm
+++ b/chrome/browser/icon_loader_mac.mm
@@ -18,6 +18,10 @@
NSWorkspace* workspace = [NSWorkspace sharedWorkspace];
NSImage* icon = [workspace iconForFileType:group];
+ // TODO(pkotwicz): Remove CHECKs once www.crbug.com/159941 is resolved.
+ CHECK(icon);
+ CHECK_LT(0u, [icon representations].count);
+
if (icon_size_ == ALL) {
// The NSImage already has all sizes.
image_.reset(new gfx::Image([icon retain]));
@@ -34,8 +38,10 @@
NOTREACHED();
}
gfx::ImageSkia image_skia(gfx::ImageSkiaFromResizedNSImage(icon, size));
- image_skia.MakeThreadSafe();
- image_.reset(new gfx::Image(image_skia));
+ if (!image_skia.isNull()) {
+ image_skia.MakeThreadSafe();
+ image_.reset(new gfx::Image(image_skia));
+ }
}
target_message_loop_->PostTask(FROM_HERE,
