Merging r55430 to the M6 branch:...

chrome/browser/views/download_item_view.cc

 // Copyright (c) 2010 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/views/download_item_view.h"
 
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 114 matching lines @@
     drop_down_pressed_(false),
     dragging_(false),
     starting_drag_(false),
     model_(model),
     save_button_(NULL),
     discard_button_(NULL),
     dangerous_download_label_(NULL),
     dangerous_download_label_sized_(false),
     disabled_while_opening_(false),
     creation_time_(base::Time::Now()),
-    ALLOW_THIS_IN_INITIALIZER_LIST(reenable_method_factory_(this)) {
+    ALLOW_THIS_IN_INITIALIZER_LIST(reenable_method_factory_(this)),
+    deleted_(NULL) {
   DCHECK(download_);
   download_->AddObserver(this);
 
   ResourceBundle &rb = ResourceBundle::GetSharedInstance();
 
   BodyImageSet normal_body_image_set = {
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_LEFT_TOP),
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_LEFT_MIDDLE),
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_LEFT_BOTTOM),
     rb.GetBitmapNamed(IDR_DOWNLOAD_BUTTON_CENTER_TOP),
@@ skipping 158 matching lines @@
   StartDownloadProgress();
 }
 
 DownloadItemView::~DownloadItemView() {
   if (context_menu_.get()) {
     context_menu_->Stop();
   }
   icon_consumer_.CancelAllRequests();
   StopDownloadProgress();
   download_->RemoveObserver(this);
+  if (deleted_)
+    *deleted_ = true;
 }
 
 // Progress animation handlers.
 
 void DownloadItemView::UpdateDownloadProgress() {
   progress_angle_ = (progress_angle_ +
                      download_util::kUnknownIncrementDegrees) %
                     download_util::kMaxDegrees;
   SchedulePaint();
 }
@@ skipping 488 matching lines @@
     point.set_y(height());
     if (base::i18n::IsRTL())
       point.set_x(drop_down_x_right_);
     else
       point.set_x(drop_down_x_left_);
 
     views::View::ConvertPointToScreen(this, &point);
 
     if (!context_menu_.get())
       context_menu_.reset(new DownloadShelfContextMenuWin(model_.get()));
+    // When we call the Run method on the menu, it runs an inner message loop
+    // that might causes us to be deleted.
+    bool deleted = false;
+    deleted_ = &deleted;
     context_menu_->Run(point);
+    if (deleted)
+      return true;  // We have been deleted! Don't access 'this'.
+    deleted_ = NULL;
 
     // If the menu action was to remove the download, this view will also be
     // invalid so we must not access 'this' in this case.
     if (context_menu_->download()) {
       drop_down_pressed_ = false;
       // Showing the menu blocks. Here we revert the state.
       SetState(NORMAL, NORMAL);
     }
   }
   return true;
@@ skipping 174 matching lines @@
 void DownloadItemView::Reenable() {
   disabled_while_opening_ = false;
   SetEnabled(true);  // Triggers a repaint.
 }
 
 bool DownloadItemView::InDropDownButtonXCoordinateRange(int x) {
   if (x > drop_down_x_left_ && x < drop_down_x_right_)
     return true;
   return false;
 }