diff options
Diffstat (limited to 'chrome/browser/ui/cocoa/shell_dialogs_mac.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/shell_dialogs_mac.mm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm index 257bb62..24b1bc9 100644 --- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm +++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm @@ -15,11 +15,11 @@ #include "base/file_util.h" #include "base/logging.h" #import "base/mac/cocoa_protocols.h" -#include "base/mac_util.h" +#include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" -#include "base/thread_restrictions.h" +#include "base/threading/thread_restrictions.h" #include "grit/generated_resources.h" static const int kFileTypePopupTag = 1234; @@ -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; @@ -289,7 +289,7 @@ NSView* SelectFileDialogImpl::GetAccessoryView(const FileTypeInfo* file_types, DCHECK(file_types); scoped_nsobject<NSNib> nib ( [[NSNib alloc] initWithNibNamed:@"SaveAccessoryView" - bundle:mac_util::MainAppBundle()]); + bundle:base::mac::MainAppBundle()]); if (!nib) return nil; @@ -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 |