Revert my download item change....

chrome/browser/gtk/download_item_gtk.cc

 // Copyright (c) 2009 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/gtk/download_item_gtk.h"
 
 #include "app/l10n_util.h"
 #include "app/gfx/canvas_paint.h"
 #include "app/gfx/font.h"
 #include "app/gfx/text_elider.h"
@@ skipping 72 matching lines @@
   DownloadShelfContextMenuGtk(BaseDownloadItemModel* model,
                               DownloadItemGtk* download_item)
       : DownloadShelfContextMenu(model),
         download_item_(download_item),
         menu_is_for_complete_download_(false) {
   }
 
   ~DownloadShelfContextMenuGtk() {
   }
 
-  GtkWidget* widget() {
-    return menu_->widget();
-  }
-
   void Popup(GtkWidget* widget, GdkEvent* event) {
     // Create the menu if we have not created it yet or we created it for
     // an in-progress download that has since completed.
     bool download_is_complete = download_->state() == DownloadItem::COMPLETE;
     if (menu_.get() == NULL ||
         (download_is_complete && !menu_is_for_complete_download_)) {
       menu_.reset(new MenuGtk(this, download_is_complete ?
           finished_download_menu : in_progress_download_menu, NULL));
       menu_is_for_complete_download_ = download_is_complete;
     }
     menu_->Popup(widget, event);
   }
 
   // MenuGtk::Delegate implementation ------------------------------------------
   virtual bool IsCommandEnabled(int id) const {
     return IsItemCommandEnabled(id);
   }
 
   virtual bool IsItemChecked(int id) const {
     return ItemIsChecked(id);
   }
 
   virtual void ExecuteCommand(int id) {
-    return ExecuteItemCommand(id);
+    ExecuteItemCommand(id);
   }
 
   virtual void StoppedShowing() {
     download_item_->menu_showing_ = false;
     gtk_widget_queue_draw(download_item_->menu_button_);
   }
 
  private:
   // The menu we show on Popup(). We keep a pointer to it for a couple reasons:
   //  * we don't want to have to recreate the menu every time it's popped up.
@@ skipping 58 matching lines @@
       arrow_(NULL),
       menu_showing_(false),
       theme_provider_(GtkThemeProvider::GetFrom(
                           parent_shelf->browser()->profile())),
       progress_angle_(download_util::kStartAngleDegrees),
       download_model_(download_model),
       bounding_widget_(parent_shelf->GetRightBoundingWidget()),
       dangerous_prompt_(NULL),
       dangerous_label_(NULL),
       icon_(NULL),
-      creation_time_(base::Time::Now()),
-      method_factory_(this) {
+      creation_time_(base::Time::Now()) {
   LoadIcon();
 
   body_.Own(gtk_button_new());
   gtk_widget_set_app_paintable(body_.get(), TRUE);
 
   g_signal_connect(body_.get(), "expose-event",
                    G_CALLBACK(OnExpose), this);
   g_signal_connect(body_.get(), "clicked",
                    G_CALLBACK(OnClick), this);
   GTK_WIDGET_UNSET_FLAGS(body_.get(), GTK_CAN_FOCUS);
@@ skipping 159 matching lines @@
 
   if (download->full_path() != icon_filepath_) {
     // Turns out the file path is "unconfirmed %d.download" for dangerous
     // downloads. When the download is confirmed, the file is renamed on
     // another thread, so reload the icon if the download filename changes.
     LoadIcon();
   }
 
   switch (download->state()) {
     case DownloadItem::REMOVING:
-      // Delete ourselves asychronously so that if we were deleted from the
-      // context menu, its ref holders have a chance to let go.
-      MessageLoop::current()->PostTask(FROM_HERE,
-          method_factory_.NewRunnableMethod(&DownloadItemGtk::RemoveThis));
+      parent_shelf_->RemoveDownloadItem(this);  // This will delete us!
       return;
     case DownloadItem::CANCELLED:
       StopDownloadProgress();
       gtk_widget_queue_draw(progress_area_.get());
       break;
     case DownloadItem::COMPLETE:
       StopDownloadProgress();
       complete_animation_.reset(new SlideAnimation(this));
       complete_animation_->SetSlideDuration(kCompleteAnimationDurationMs);
       complete_animation_->SetTweenType(SlideAnimation::NONE);
@@ skipping 18 matching lines @@
   // Remove the status text label.
   if (status_text.empty()) {
     gtk_widget_destroy(status_label_);
     status_label_ = NULL;
     return;
   }
 
   UpdateStatusLabel(status_label_, status_text_);
 }
 
-void DownloadItemGtk::RemoveThis() {
-  parent_shelf_->RemoveDownloadItem(this);
-}
-
 void DownloadItemGtk::AnimationProgressed(const Animation* animation) {
   if (animation == complete_animation_.get()) {
     gtk_widget_queue_draw(progress_area_.get());
   } else {
     if (IsDangerous()) {
       int progress = (dangerous_hbox_full_width_ -
                      dangerous_hbox_start_width_) *
                      new_item_animation_->GetCurrentValue();
       int showing_width = dangerous_hbox_start_width_ + progress;
       gtk_widget_set_size_request(dangerous_hbox_, showing_width, -1);
@@ skipping 444 matching lines @@
 
 // static
 void DownloadItemGtk::OnDangerousDecline(GtkWidget* button,
                                          DownloadItemGtk* item) {
   UMA_HISTOGRAM_LONG_TIMES("clickjacking.discard_download",
                            base::Time::Now() - item->creation_time_);
   if (item->get_download()->state() == DownloadItem::IN_PROGRESS)
     item->get_download()->Cancel(true);
   item->get_download()->Remove(true);
 }