Mac: the return of the tab-modal-sheets patch.

chrome/browser/download/save_package.cc

 // Copyright (c) 2009 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/download/save_package.h"
 
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/i18n/file_util_icu.h"
@@ skipping 1104 matching lines @@
       new SavePackageParam(tab_contents_->contents_mime_type());
 
   bool can_save_as_complete =
       CanSaveAsComplete(save_params->current_tab_mime_type);
 
   FilePath title =
       FilePath::FromWStringHack(UTF16ToWideHack(tab_contents_->GetTitle()));
   FilePath suggested_path =
       save_dir.Append(GetSuggestedNameForSaveAs(title, can_save_as_complete));
 
-  // If the contents can not be saved as complete-HTML, do not show the
+  // If the contents cannot be saved as complete-HTML, do not show the
   // file filters.
   if (can_save_as_complete) {
     file_type_info.extensions.resize(2);
     file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("htm"));
     file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
     file_type_info.extension_description_overrides.push_back(
         WideToUTF16(l10n_util::GetString(IDS_SAVE_PAGE_DESC_HTML_ONLY)));
     file_type_info.extensions[1].push_back(FILE_PATH_LITERAL("htm"));
     file_type_info.extensions[1].push_back(FILE_PATH_LITERAL("html"));
     file_type_info.extension_description_overrides.push_back(
         WideToUTF16(l10n_util::GetString(IDS_SAVE_PAGE_DESC_COMPLETE)));
     file_type_info.include_all_files = false;
     default_extension = kDefaultHtmlExtension;
   } else {
     file_type_info.extensions.resize(1);
     file_type_info.extensions[0].push_back(suggested_path.Extension());
     if (!file_type_info.extensions[0][0].empty())
       file_type_info.extensions[0][0].erase(0, 1);  // drop the .
     file_type_info.include_all_files = true;
     file_type_index = 1;
   }
 
   if (g_should_prompt_for_filename) {
     if (!select_file_dialog_.get())
       select_file_dialog_ = SelectFileDialog::Create(this);
+#if defined(OS_MACOSX)
+    select_file_dialog_->SelectFileInTab(SelectFileDialog::SELECT_SAVEAS_FILE,
+                                         string16(),
+                                         suggested_path,
+                                         &file_type_info,
+                                         file_type_index,
+                                         default_extension,
+                                         tab_contents_,
+                                         save_params);
+#else
     select_file_dialog_->SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE,
                                     string16(),
                                     suggested_path,
                                     &file_type_info,
                                     file_type_index,
                                     default_extension,
                                     platform_util::GetTopLevel(
                                         tab_contents_->GetNativeView()),
                                     save_params);
+#endif
   } else {
     // Just use 'suggested_path' instead of opening the dialog prompt.
     ContinueSave(save_params, suggested_path, file_type_index);
     delete save_params;
   }
 }
 
 // Called after the save file dialog box returns.
 void SavePackage::ContinueSave(SavePackageParam* param,
                                const FilePath& final_name,
@@ skipping 94 matching lines @@
                                int index, void* params) {
   SavePackageParam* save_params = reinterpret_cast<SavePackageParam*>(params);
   ContinueSave(save_params, path, index);
   delete save_params;
 }
 
 void SavePackage::FileSelectionCanceled(void* params) {
   SavePackageParam* save_params = reinterpret_cast<SavePackageParam*>(params);
   delete save_params;
 }