Update browser actions api to be like new design doc.

BUG=23879
TEST=Install sample gmail browser action sample.

Review URL: http://codereview.chromium.org/264046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29068 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/extensions/image_loading_tracker.cc b/chrome/browser/extensions/image_loading_tracker.cc
index e141391..a2e4281 100644
--- a/chrome/browser/extensions/image_loading_tracker.cc
+++ b/chrome/browser/extensions/image_loading_tracker.cc
@@ -38,7 +38,6 @@ class ImageLoadingTracker::LoadImageTask : public Task {
       index_(index) {}
 
   void ReportBack(SkBitmap* image) {
-    DCHECK(image);
     callback_loop_->PostTask(FROM_HERE, NewRunnableMethod(tracker_,
         &ImageLoadingTracker::OnImageLoaded,
         image,
@@ -103,13 +102,12 @@ void ImageLoadingTracker::PostLoadImageTask(const ExtensionResource& resource) {
 }
 
 void ImageLoadingTracker::OnImageLoaded(SkBitmap* image, size_t index) {
-  if (image == NULL) {
-    NOTREACHED() << "Image failed to decode.";
-    image = new SkBitmap();
-  }
   if (observer_)
     observer_->OnImageLoaded(image, index);
-  delete image;
+
+  if (image)
+    delete image;
+
   if (--image_count_ == 0)
     Release();  // We are no longer needed.
 }