Show or open downloaded items on the UI thread for Mac

chrome/browser/download/save_package.cc

 // Copyright (c) 2006-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_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 419 matching lines @@
     FilePath final_name = saved_main_directory_path_.Append(generated_name);
     save_item->Rename(final_name);
   } else {
     // It is the main HTML file, use the name chosen by the user.
     save_item->Rename(saved_main_file_path_);
   }
 
   // If the save source is from file system, inform SaveFileManager to copy
   // corresponding file to the file path which this SaveItem specifies.
   if (info->save_source == SaveFileCreateInfo::SAVE_FILE_FROM_FILE) {
-    file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+    file_manager_->file_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(file_manager_,
                           &SaveFileManager::SaveLocalFile,
                           save_item->url(),
                           save_item->save_id(),
                           tab_id()));
     return;
   }
 
   // Check whether we begin to require serialized HTML data.
   if (save_type_ == SAVE_AS_COMPLETE_HTML && wait_state_ == HTML_DATA) {
@@ skipping 85 matching lines @@
   // This vector contains the save ids of the save files which SaveFileManager
   // needs to remove from its save_file_map_.
   SaveIDList save_ids;
   for (SavedItemMap::iterator it = saved_success_items_.begin();
       it != saved_success_items_.end(); ++it)
     save_ids.push_back(it->first);
   for (SaveUrlItemMap::iterator it = saved_failed_items_.begin();
       it != saved_failed_items_.end(); ++it)
     save_ids.push_back(it->second->save_id());
 
-  file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+  file_manager_->file_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &SaveFileManager::RemoveSavedFileFromFileMap,
                         save_ids));
 
   finished_ = true;
   wait_state_ = FAILED;
 
   // Inform the DownloadItem we have canceled whole save page job.
   download_->Cancel(false);
 }
 
 void SavePackage::CheckFinish() {
   if (in_process_count() || finished_)
     return;
 
   FilePath dir = (save_type_ == SAVE_AS_COMPLETE_HTML &&
                   saved_success_items_.size() > 1) ?
                   saved_main_directory_path_ : FilePath();
 
   // This vector contains the final names of all the successfully saved files
   // along with their save ids. It will be passed to SaveFileManager to do the
   // renaming job.
   FinalNameList final_names;
   for (SavedItemMap::iterator it = saved_success_items_.begin();
       it != saved_success_items_.end(); ++it)
     final_names.push_back(std::make_pair(it->first,
                                          it->second->full_path()));
 
-  file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+  file_manager_->file_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &SaveFileManager::RenameAllFiles,
                         final_names,
                         dir,
                         tab_contents_->process()->pid(),
                         tab_contents_->render_view_host()->routing_id()));
 }
 
 // Successfully finished all items of this SavePackage.
 void SavePackage::Finish() {
   // User may cancel the job when we're moving files to the final directory.
   if (canceled())
     return;
 
   wait_state_ = SUCCESSFUL;
   finished_ = true;
 
   // This vector contains the save ids of the save files which SaveFileManager
   // needs to remove from its save_file_map_.
   SaveIDList save_ids;
   for (SaveUrlItemMap::iterator it = saved_failed_items_.begin();
        it != saved_failed_items_.end(); ++it)
     save_ids.push_back(it->second->save_id());
 
-  file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+  file_manager_->file_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &SaveFileManager::RemoveSavedFileFromFileMap,
                         save_ids));
 
   download_->Finished(all_save_items_count_);
 
   NotificationService::current()->Notify(
       NotificationType::SAVE_PACKAGE_SUCCESSFULLY_FINISHED,
       Source<SavePackage>(this),
       Details<GURL>(&page_url_));
@@ skipping 75 matching lines @@
 
   CheckFinish();
 }
 
 void SavePackage::SaveCanceled(SaveItem* save_item) {
   // Call the RemoveSaveFile in UI thread.
   file_manager_->RemoveSaveFile(save_item->save_id(),
                                 save_item->url(),
                                 this);
   if (save_item->save_id() != -1)
-    file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+    file_manager_->file_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(file_manager_,
                           &SaveFileManager::CancelSave,
                           save_item->save_id()));
 }
 
 // Initiate a saving job of a specific URL. We send the request to
 // SaveFileManager, which will dispatch it to different approach according to
 // the save source. Parameter process_all_remaining_items indicates whether
 // we need to save all remaining items.
 void SavePackage::SaveNextFile(bool process_all_remaining_items) {
@@ skipping 21 matching lines @@
                            this);
   } while (process_all_remaining_items && waiting_item_queue_.size());
 }
 
 
 // Open download page in windows explorer on file thread, to avoid blocking the
 // user interface.
 void SavePackage::ShowDownloadInShell() {
   DCHECK(file_manager_);
   DCHECK(finished_ && !canceled() && !saved_main_file_path_.empty());
-  file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+  DCHECK(MessageLoop::current() == file_manager_->ui_loop());
+#if defined(OS_MACOSX)
+  // Mac OS X requires opening downloads on the UI thread.
+  platform_util::ShowItemInFolder(saved_main_file_path_);
+#else
+  file_manager_->file_loop()->PostTask(FROM_HERE,
       NewRunnableMethod(file_manager_,
                         &SaveFileManager::OnShowSavedFileInShell,
                         saved_main_file_path_));
+#endif
 }
 
 // Calculate the percentage of whole save page job.
 int SavePackage::PercentComplete() {
   if (!all_save_items_count_)
     return 0;
   else if (!in_process_count())
     return 100;
   else
     return completed_count() / all_save_items_count_;
@@ skipping 96 matching lines @@
   // Check current state.
   if (wait_state_ != HTML_DATA)
     return;
 
   int id = tab_id();
   // If the all frames are finished saving, we need to close the
   // remaining SaveItems.
   if (flag == webkit_glue::DomSerializerDelegate::ALL_FRAMES_ARE_FINISHED) {
     for (SaveUrlItemMap::iterator it = in_progress_items_.begin();
          it != in_progress_items_.end(); ++it) {
-      file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+      file_manager_->file_loop()->PostTask(FROM_HERE,
           NewRunnableMethod(file_manager_,
                             &SaveFileManager::SaveFinished,
                             it->second->save_id(),
                             it->second->url(),
                             id,
                             true));
     }
     return;
   }
 
   SaveUrlItemMap::iterator it = in_progress_items_.find(frame_url.spec());
   if (it == in_progress_items_.end())
     return;
   SaveItem* save_item = it->second;
   DCHECK(save_item->save_source() == SaveFileCreateInfo::SAVE_FILE_FROM_DOM);
 
   if (!data.empty()) {
     // Prepare buffer for saving HTML data.
     net::IOBuffer* new_data = new net::IOBuffer(data.size());
     new_data->AddRef();  // We'll pass the buffer to SaveFileManager.
     memcpy(new_data->data(), data.data(), data.size());
 
     // Call write file functionality in file thread.
-    file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+    file_manager_->file_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(file_manager_,
                           &SaveFileManager::UpdateSaveProgress,
                           save_item->save_id(),
                           new_data,
                           static_cast<int>(data.size())));
   }
 
   // Current frame is completed saving, call finish in file thread.
   if (flag == webkit_glue::DomSerializerDelegate::CURRENT_FRAME_IS_FINISHED) {
-    file_manager_->GetSaveLoop()->PostTask(FROM_HERE,
+    file_manager_->file_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(file_manager_,
                           &SaveFileManager::SaveFinished,
                           save_item->save_id(),
                           save_item->url(),
                           id,
                           true));
   }
 }
 
 // Ask for all savable resource links from backend, include main frame and
@@ skipping 297 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;
 }