Mac: Try to fix a crash related to save panels.

chrome/browser/ui/cocoa/shell_dialogs_mac.mm

 // 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.
 
 #include "chrome/browser/shell_dialogs.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
 
 #include <map>
@@ skipping 18 matching lines @@
 // A bridge class to act as the modal delegate to the save/open sheet and send
 // the results to the C++ class.
 @interface SelectFileDialogBridge : NSObject<NSOpenSavePanelDelegate> {
  @private
   SelectFileDialogImpl* selectFileDialogImpl_;  // WEAK; owns us
 }
 
 - (id)initWithSelectFileDialogImpl:(SelectFileDialogImpl*)s;
 - (void)endedPanel:(NSSavePanel*)panel
         withReturn:(int)returnCode
-           context:(void *)context;
+           context:(void*)context;
 
 // NSSavePanel delegate method
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename;
 
 @end
 
 // Implementation of SelectFileDialog that shows Cocoa dialogs for choosing a
 // file or folder.
 class SelectFileDialogImpl : public SelectFileDialog {
  public:
@@ skipping 69 matching lines @@
   // to hold the pointers, since we can't delete from the map as we're iterating
   // through it.
   std::vector<NSSavePanel*> panels;
   for (std::map<NSSavePanel*, void*>::iterator it = params_map_.begin();
        it != params_map_.end(); ++it) {
     panels.push_back(it->first);
   }
 
   for (std::vector<NSSavePanel*>::iterator it = panels.begin();
        it != panels.end(); ++it) {
-    [(*it) cancel:nil];
+    [*it cancel:*it];
   }
 }
 
 bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow parent_window) const {
   return parents_.find(parent_window) != parents_.end();
 }
 
 void SelectFileDialogImpl::ListenerDestroyed() {
   listener_ = NULL;
 }
@@ skipping 69 matching lines @@
 
   if (!default_extension.empty())
     [dialog setRequiredFileType:base::SysUTF8ToNSString(default_extension)];
 
   params_map_[dialog] = params;
   type_map_[dialog] = type;
 
   SheetContext* context = new SheetContext;
 
   // |context| should never be NULL, but we are seeing indications otherwise.
-  // |This CHECK is here to confirm if we are actually getting NULL
-  // ||context|s. http://crbug.com/58959
+  // This CHECK is here to confirm if we are actually getting NULL
+  // |context|s. http://crbug.com/58959
   CHECK(context);
   context->type = type;
   context->owning_window = owning_window;
 
   if (type == SELECT_SAVEAS_FILE) {
     [dialog beginSheetForDirectory:default_dir
                               file:default_filename
                     modalForWindow:owning_window
                      modalDelegate:bridge_.get()
                     didEndSelector:@selector(endedPanel:withReturn:context:)
@@ skipping 123 matching lines @@
 - (id)initWithSelectFileDialogImpl:(SelectFileDialogImpl*)s {
   self = [super init];
   if (self != nil) {
     selectFileDialogImpl_ = s;
   }
   return self;
 }
 
 - (void)endedPanel:(NSSavePanel*)panel
         withReturn:(int)returnCode
-           context:(void *)context {
+           context:(void*)context {
   // |context| should never be NULL, but we are seeing indications otherwise.
   // |This CHECK is here to confirm if we are actually getting NULL
   // ||context|s. http://crbug.com/58959
   CHECK(context);
 
   int index = 0;
   SelectFileDialogImpl::SheetContext* context_struct =
       (SelectFileDialogImpl::SheetContext*)context;
 
   SelectFileDialog::Type type = context_struct->type;
@@ skipping 33 matching lines @@
                                          paths,
                                          index);
   [panel release];
 }
 
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename {
   return selectFileDialogImpl_->ShouldEnableFilename(sender, filename);
 }
 
 @end