Merge 140870 - Retain the controller in -[DownloadItemButton rightMouseDown:] before opening the me…

chrome/browser/ui/cocoa/download/download_item_button.mm

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
 #import "chrome/browser/ui/cocoa/download/download_item_button.h"
 
 #include "base/logging.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
 #import "chrome/browser/ui/cocoa/download/download_item_controller.h"
 
@@ skipping 24 matching lines @@
     // represent a file that's auto-removed (e.g. a theme).
     scoped_nsobject<DownloadItemController> ref([controller_ retain]);
     [cell setHighlighted:YES];
     [[self menu] setDelegate:self];
     [NSMenu popUpContextMenu:[self menu]
                    withEvent:[NSApp currentEvent]
                      forView:self];
   }
 }
 
+// Override to retain the controller, in case a closure is pumped that deletes
+// the DownloadItemController while the menu is open <http://crbug.com/129826>.
+- (void)rightMouseDown:(NSEvent*)event {
+  scoped_nsobject<DownloadItemController> ref([controller_ retain]);
+  [super rightMouseDown:event];
+}
+
 - (void)menuDidClose:(NSMenu*)menu {
   [[self cell] setHighlighted:NO];
 }
 
 - (BOOL)shouldDelayWindowOrderingForEvent:(NSEvent*)event {
   return YES;
 }
 
 @end