Merging r55430 to the M6 branch:...

chrome/browser/views/download_item_view.h

 // Copyright (c) 2006-2008 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.
 //
 // A ChromeView that implements one download on the Download shelf.
 // Each DownloadItemView contains an application icon, a text label
 // indicating the download's file name, a text label indicating the
 // download's status (such as the number of bytes downloaded so far)
 // and a button for canceling an in progress download, or opening
 // the completed download.
@@ skipping 237 matching lines @@
   // The time at which this view was created.
   base::Time creation_time_;
 
   // Method factory used to delay reenabling of the item when opening the
   // downloaded file.
   ScopedRunnableMethodFactory<DownloadItemView> reenable_method_factory_;
 
   // The currently running download context menu.
   scoped_ptr<DownloadShelfContextMenuWin> context_menu_;
 
+  // If non-NULL, set to true when this object is deleted.
+  // (Used when showing the context menu as it runs an inner message loop that
+  // might delete us).
+  bool* deleted_;
+
   DISALLOW_COPY_AND_ASSIGN(DownloadItemView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_DOWNLOAD_ITEM_VIEW_H__