mac: Switch to "new" (10.6) block-based panel apis

ui/base/dialogs/select_file_dialog_mac.mm

 // 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.
 
 #include "ui/base/dialogs/select_file_dialog.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
 
 #include <map>
@@ skipping 30 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;
+         didCancel:(bool)did_cancel
+              type:(ui::SelectFileDialog::Type)type
+      parentWindow:(NSWindow*)parentWindow;
 
 // 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 ui::SelectFileDialog {
  public:
   explicit SelectFileDialogImpl(Listener* listener,
                                 ui::SelectFilePolicy* policy);
 
   // BaseShellDialog implementation.
   virtual bool IsRunning(gfx::NativeWindow parent_window) const;
   virtual void ListenerDestroyed();
 
   // Callback from ObjC bridge.
   void FileWasSelected(NSSavePanel* dialog,
                        NSWindow* parent_window,
                        bool was_cancelled,
                        bool is_multi,
                        const std::vector<FilePath>& files,
                        int index);
 
   bool ShouldEnableFilename(NSSavePanel* dialog, NSString* filename);
 
-  struct SheetContext {
-    Type type;
-    NSWindow* owning_window;
-  };
-
  protected:
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
   virtual void SelectFileImpl(Type type,
                               const string16& title,
                               const FilePath& default_path,
                               const FileTypeInfo* file_types,
                               int file_type_index,
                               const FilePath::StringType& default_extension,
                               gfx::NativeWindow owning_window,
@@ skipping 49 matching lines @@
   void* params = params_map_[dialog];
   params_map_.erase(dialog);
   parents_.erase(parent_window);
   type_map_.erase(dialog);
 
   [dialog setDelegate:nil];
 
   if (!listener_)
     return;
 
-  if (was_cancelled) {
+  if (was_cancelled || files.empty()) {
     listener_->FileSelectionCanceled(params);
   } else {
     if (is_multi) {
       listener_->MultiFilesSelected(files, params);
     } else {
       listener_->FileSelected(files[0], index, params);
     }
   }
 }
 
@@ skipping 82 matching lines @@
       [dialog setAccessoryView:accessory_view];
     }
   } else {
     // If no type info is specified, anything goes.
     [dialog setAllowsOtherFileTypes:YES];
   }
   hasMultipleFileTypeChoices_ =
       file_types ? file_types->extensions.size() > 1 : true;
 
   if (!default_extension.empty())
-    [dialog setRequiredFileType:base::SysUTF8ToNSString(default_extension)];
+    [dialog setAllowedFileTypes:@[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
-  CHECK(context);
-  context->type = type;
-  context->owning_window = owning_window;
-
   if (type == SELECT_SAVEAS_FILE) {
     [dialog setCanSelectHiddenExtension:YES];
-    [dialog beginSheetForDirectory:default_dir
-                              file:default_filename
-                    modalForWindow:owning_window
-                     modalDelegate:bridge_.get()
-                    didEndSelector:@selector(endedPanel:withReturn:context:)
-                       contextInfo:context];
+    [dialog setDirectoryURL:[NSURL fileURLWithPath:default_dir]];
+    [dialog setNameFieldStringValue:default_filename];
+    [dialog beginSheetModalForWindow:owning_window
+                   completionHandler:^(NSInteger result) {
+      [bridge_.get() endedPanel:dialog
+                      didCancel:result != NSFileHandlingPanelOKButton
+                           type:type
+                   parentWindow:owning_window];
+    }];

[Avi (use Gerrit), 2012/07/27 14:36:01]

This code (from -setDirectoryURL down to here)...

   } else {
     NSOpenPanel* open_dialog = (NSOpenPanel*)dialog;
 
     if (type == SELECT_OPEN_MULTI_FILE)
       [open_dialog setAllowsMultipleSelection:YES];
     else
       [open_dialog setAllowsMultipleSelection:NO];
 
     if (type == SELECT_FOLDER) {
       [open_dialog setCanChooseFiles:NO];
       [open_dialog setCanChooseDirectories:YES];
       [open_dialog setCanCreateDirectories:YES];
       NSString *prompt = l10n_util::GetNSString(IDS_SELECT_FOLDER_BUTTON_TITLE);
       [open_dialog setPrompt:prompt];
     } else {
       [open_dialog setCanChooseFiles:YES];
       [open_dialog setCanChooseDirectories:NO];
     }
 
     [open_dialog setDelegate:bridge_.get()];
-    [open_dialog beginSheetForDirectory:default_dir
-                                   file:default_filename
-                                  types:allowed_file_types
-                         modalForWindow:owning_window
-                          modalDelegate:bridge_.get()
-                        didEndSelector:@selector(endedPanel:withReturn:context:)
-                            contextInfo:context];
+    [open_dialog setAllowedFileTypes:allowed_file_types];
+    [open_dialog setDirectoryURL:[NSURL fileURLWithPath:default_dir]];
+    [open_dialog setNameFieldStringValue:default_filename];
+    [open_dialog beginSheetModalForWindow:owning_window
+                        completionHandler:^(NSInteger result) {
+      [bridge_.get() endedPanel:dialog
+                      didCancel:result != NSFileHandlingPanelOKButton
+                           type:type
+                   parentWindow:owning_window];
+    }];

[Avi (use Gerrit), 2012/07/27 14:36:01]

...and this code here are identical. Consolidate them outside the if.

[Nico, 2012/07/27 14:48:43]

Done.

   }
 }
 
 SelectFileDialogImpl::~SelectFileDialogImpl() {
   // Walk through the open dialogs and close them all.  Use a temporary vector
   // 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) {
@@ skipping 51 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| 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);
-
+         didCancel:(bool)did_cancel
+              type:(ui::SelectFileDialog::Type)type
+      parentWindow:(NSWindow*)parentWindow {
   int index = 0;
-  SelectFileDialogImpl::SheetContext* context_struct =
-      (SelectFileDialogImpl::SheetContext*)context;
-
-  ui::SelectFileDialog::Type type = context_struct->type;
-  NSWindow* parentWindow = context_struct->owning_window;
-  delete context_struct;
-
-  bool isMulti = type == ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE;
-
   std::vector<FilePath> paths;
-  bool did_cancel = returnCode == NSCancelButton;
   if (!did_cancel) {
     if (type == ui::SelectFileDialog::SELECT_SAVEAS_FILE) {
-      paths.push_back(FilePath(base::SysNSStringToUTF8([panel filename])));
+      if ([[panel URL] isFileURL])
+        paths.push_back(FilePath(base::SysNSStringToUTF8([[panel URL] path])));
 
       NSView* accessoryView = [panel accessoryView];
       if (accessoryView) {
         NSPopUpButton* popup = [accessoryView viewWithTag:kFileTypePopupTag];
         if (popup) {
           // File type indexes are 1-based.
           index = [popup indexOfSelectedItem] + 1;
         }
       } else {
         index = 1;
       }
     } else {
       CHECK([panel isKindOfClass:[NSOpenPanel class]]);
-      NSArray* filenames = [static_cast<NSOpenPanel*>(panel) filenames];
-      for (NSString* filename in filenames)
-        paths.push_back(FilePath(base::SysNSStringToUTF8(filename)));
+      NSArray* urls = [static_cast<NSOpenPanel*>(panel) URLs];
+      for (NSURL* url in urls)
+        if ([url isFileURL])
+          paths.push_back(FilePath(base::SysNSStringToUTF8([url path])));
     }
   }
 
+  bool isMulti = type == ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE;
   selectFileDialogImpl_->FileWasSelected(panel,
                                          parentWindow,
                                          did_cancel,
                                          isMulti,
                                          paths,
                                          index);
   [panel release];
 }
 
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename {
   return selectFileDialogImpl_->ShouldEnableFilename(sender, filename);
 }
 
 @end
 
 namespace ui {
 
 SelectFileDialog* CreateMacSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
   return new SelectFileDialogImpl(listener, policy);
 }
 
 }  // namespace ui