Get save page working on posix.

chrome/browser/download/save_package.cc

 // Copyright (c) 2006-2008 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 "base/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 249 matching lines @@
     return false;
   }
 
   file_manager_ = rdh->save_file_manager();
   if (!file_manager_) {
     NOTREACHED();
     return false;
   }
 
   // Create the fake DownloadItem and display the view.
+  download_ = new DownloadItem(1, saved_main_file_path_, 0, page_url_,
+      FilePath(), Time::Now(), 0, -1, -1, false);
+  download_->set_manager(web_contents_->profile()->GetDownloadManager());
 #if defined(OS_WIN)
   // TODO(port): We need to do something like this on posix, but avoid
   // using DownloadShelfView, which probably should not be ported directly.
-  download_ = new DownloadItem(1, saved_main_file_path_, 0, page_url_,
-      FilePath(), Time::Now(), 0, -1, -1, false);
-  download_->set_manager(web_contents_->profile()->GetDownloadManager());
   DownloadShelfView* shelf = web_contents_->GetDownloadShelfView();
   shelf->AddDownloadView(new DownloadItemView(
       download_, shelf, new SavePageModel(this, download_)));
   web_contents_->SetDownloadShelfVisible(true);
 #elif defined(OS_POSIX)
   NOTIMPLEMENTED();
 #endif
 
   // Check save type and process the save page job.
   if (save_type_ == SAVE_AS_COMPLETE_HTML) {
@@ skipping 268 matching lines @@
 
   file_manager_->GetSaveLoop()->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.
-  DCHECK(download_);
   download_->Cancel(false);
 }
 
 void SavePackage::CheckFinish() {
   if (in_process_count() || finished_)
     return;
 
   FilePath dir = save_type_ == SAVE_AS_COMPLETE_HTML ?
                  saved_main_directory_path_ :
                  FilePath();
@@ skipping 30 matching lines @@
   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,
       NewRunnableMethod(file_manager_,
                         &SaveFileManager::RemoveSavedFileFromFileMap,
                         save_ids));
 
-  DCHECK(download_);
   download_->Finished(all_save_items_count_);
 }
 
 // Called for updating end state.
 void SavePackage::SaveFinished(int32 save_id, int64 size, bool is_success) {
   // Because we might have canceled this saving job before,
   // so we might not find corresponding SaveItem. Just ignore it.
   SaveItem* save_item = LookupItemInProcessBySaveId(save_id);
   if (!save_item)
     return;
 
   // Let SaveItem set end state.
   save_item->Finish(size, is_success);
   // Remove the associated save id and SavePackage.
   file_manager_->RemoveSaveFile(save_id, save_item->url(), this);
 
   PutInProgressItemToSavedMap(save_item);
 
   // Inform the DownloadItem to update UI.
-  DCHECK(download_);
   // We use the received bytes as number of saved files.
   download_->Update(completed_count());
 
   if (save_item->save_source() == SaveFileCreateInfo::SAVE_FILE_FROM_DOM &&
       save_item->url() == page_url_ && !save_item->received_bytes()) {
     // If size of main HTML page is 0, treat it as disk error.
     Cancel(false);
     return;
   }
 
@@ skipping 21 matching lines @@
     NOTREACHED();  // Should not exist!
     return;
   }
   SaveItem* save_item = it->second;
 
   save_item->Finish(0, false);
 
   PutInProgressItemToSavedMap(save_item);
 
   // Inform the DownloadItem to update UI.
-  DCHECK(download_);
   // We use the received bytes as number of saved files.
   download_->Update(completed_count());
 
   if (save_type_ == SAVE_AS_ONLY_HTML ||
       save_item->save_source() == SaveFileCreateInfo::SAVE_FILE_FROM_DOM) {
     // We got error when saving page. Treat it as disk error.
     Cancel(true);
   }
 
   if (canceled()) {
@@ skipping 297 matching lines @@
   // Get the directory from preference.
   StringPrefMember save_file_path;
   save_file_path.Init(prefs::kSaveFileDefaultDirectory, prefs, NULL);
   DCHECK(!(*save_file_path).empty());
 
   // Ask user for getting final saving name.
   std::wstring file_name = name.ToWStringHack();
   // TODO(port): we need a version of ReplaceIllegalCharacters() that takes
   // FilePaths.
   file_util::ReplaceIllegalCharacters(&file_name, L' ');
+  TrimWhitespace(file_name, TRIM_ALL, &file_name);
   FilePath suggest_name = FilePath::FromWStringHack(save_file_path.GetValue());
   suggest_name = suggest_name.Append(FilePath::FromWStringHack(file_name));
 
   return suggest_name;
 }
 
 // Static.
 bool SavePackage::GetSaveInfo(const FilePath& suggest_name,
                               gfx::NativeView container_window,
                               SavePackageParam* param,
@@ skipping 29 matching lines @@
                               &main_file_path, g_should_prompt_for_filename);
     param->saved_main_file_path = FilePath::FromWStringHack(main_file_path);
     if (!success)
       return false;
 
     // Set save-as type to only-HTML if the contents of current tab can not be
     // saved as complete-HTML.
     index = 1;
   }
 
-  DCHECK(download_manager);
   // Ensure the filename is safe.
   download_manager->GenerateSafeFilename(param->current_tab_mime_type,
                                          &param->saved_main_file_path);
 
   // The option index is not zero-based.
   DCHECK(index > 0 && index < 3);
   param->dir = param->saved_main_file_path.DirName();
 
   StringPrefMember save_file_path;
   save_file_path.Init(prefs::kSaveFileDefaultDirectory, param->prefs, NULL);
@@ skipping 59 matching lines @@
     *pure_file_name =
         pure_file_name->substr(0, available_length);
     return true;
   }
 
   // Not enough room to even use a shortened |pure_file_name|.
   pure_file_name->clear();
   return false;
 }