diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm index 257bb628aa0e999534c87d8e61e18e79d678383e..92b2f589f183b52c6eaeb610ca21c0925f4c2adf 100644 --- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm +++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm @@ -36,7 +36,7 @@ class SelectFileDialogImpl; - (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; @@ -126,7 +126,7 @@ SelectFileDialogImpl::~SelectFileDialogImpl() { for (std::vector<NSSavePanel*>::iterator it = panels.begin(); it != panels.end(); ++it) { - [(*it) cancel:nil]; + [*it cancel:*it]; } } @@ -216,8 +216,8 @@ void SelectFileDialogImpl::SelectFile( 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; @@ -361,7 +361,7 @@ bool SelectFileDialogImpl::ShouldEnableFilename(NSSavePanel* dialog, - (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