Reland DownloadItem::Observer::OnDownloadDestroyed() replaces DownloadItem::REMOVING

chrome/browser/ui/views/download/download_item_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/download/download_item_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 279 matching lines @@
         complete_animation_->SetSlideDuration(kCompleteAnimationDurationMs);
         complete_animation_->SetTweenType(ui::Tween::LINEAR);
         complete_animation_->Show();
         SchedulePaint();
         LoadIcon();
         break;
       case DownloadItem::CANCELLED:
         StopDownloadProgress();
         LoadIcon();
         break;
-      case DownloadItem::REMOVING:
-        parent_->RemoveDownloadView(this);  // This will delete us!
-        return;
       default:
         NOTREACHED();
     }
     status_text_ = status_text;
   }
 
   string16 new_tip = model_->GetTooltipText(font_, kTooltipMaxWidth);
   if (new_tip != tooltip_text_) {
     tooltip_text_ = new_tip;
     TooltipTextChanged();
   }
 
   UpdateAccessibleName();
 
   // We use the parent's (DownloadShelfView's) SchedulePaint, since there
   // are spaces between each DownloadItemView that the parent is responsible
   // for painting.
   parent()->SchedulePaint();
 }
 
+void DownloadItemView::OnDownloadDestructed(DownloadItem* download) {
+  parent_->RemoveDownloadView(this);  // This will delete us!
+}
+
 void DownloadItemView::OnDownloadOpened(DownloadItem* download) {
   disabled_while_opening_ = true;
   SetEnabled(false);
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE,
       base::Bind(&DownloadItemView::Reenable,
                  weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kDisabledOnOpenDuration));
 
   // Notify our parent.
@@ skipping 848 matching lines @@
     // Drop down button is glued to the left of the download shelf.
     drop_down_x_left_ = 0;
     drop_down_x_right_ = normal_drop_down_image_set_.top->width();
   } else {
     // Drop down button is glued to the right of the download shelf.
     drop_down_x_left_ =
       size.width() - normal_drop_down_image_set_.top->width();
     drop_down_x_right_ = size.width();
   }
 }