Get save page working on posix.

* rearrange some IFDEFs
* trim whitespace on suggest name

Also fix a relatively new bug in DomSerializer.
Review URL: http://codereview.chromium.org/27106

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10314 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 11 insertions, 15 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index 9c479a6..5af7a2b 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -743,6 +743,11 @@ void Browser::BookmarkCurrentPage() {
   window_->ShowBookmarkBubble(url, model->IsBookmarked(url));
 }
 
+void Browser::SavePage() {
+  UserMetrics::RecordAction(L"SavePage", profile_);
+  GetSelectedTabContents()->AsWebContents()->OnSavePage();
+}
+
 void Browser::ViewSource() {
   UserMetrics::RecordAction(L"ViewSource", profile_);
 
@@ -766,11 +771,6 @@ void Browser::Print() {
   GetSelectedTabContents()->AsWebContents()->PrintPreview();
 }
 
-void Browser::SavePage() {
-  UserMetrics::RecordAction(L"SavePage", profile_);
-  GetSelectedTabContents()->AsWebContents()->OnSavePage();
-}
-
 void Browser::ToggleEncodingAutoDetect() {
   UserMetrics::RecordAction(L"AutoDetectChange", profile_);
   encoding_auto_detect_.SetValue(!encoding_auto_detect_.GetValue());
@@ -1113,12 +1113,12 @@ void Browser::ExecuteCommand(int id) {
     case IDC_EXIT:                  Exit();                        break;
 
     // Page-related commands
+    case IDC_SAVE_PAGE:             SavePage();                    break;
     case IDC_STAR:                  BookmarkCurrentPage();         break;
     case IDC_VIEW_SOURCE:           ViewSource();                  break;
 #if defined(OS_WIN)
     case IDC_CLOSE_POPUPS:          ClosePopups();                 break;
     case IDC_PRINT:                 Print();                       break;
-    case IDC_SAVE_PAGE:             SavePage();                    break;
     case IDC_ENCODING_AUTO_DETECT:  ToggleEncodingAutoDetect();    break;
     case IDC_ENCODING_UTF8:
     case IDC_ENCODING_UTF16LE:
diff --git a/chrome/browser/browser.h b/chrome/browser/browser.h
index 828e9c6..35c615f 100644
--- a/chrome/browser/browser.h
+++ b/chrome/browser/browser.h
@@ -248,11 +248,11 @@ class Browser : public TabStripModelDelegate,
 
   // Page-related commands
   void BookmarkCurrentPage();
+  void SavePage();
   void ViewSource();
 #if defined(OS_WIN)
   void ClosePopups();
   void Print();
-  void SavePage();
   void ToggleEncodingAutoDetect();
   void OverrideEncoding(int encoding_id);
 
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 2e206ff..9db2610 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -267,12 +267,12 @@ bool SavePackage::Init() {
   }
 
   // Create the fake DownloadItem and display the view.
-#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());
+#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.
   DownloadShelfView* shelf = web_contents_->GetDownloadShelfView();
   shelf->AddDownloadView(new DownloadItemView(
       download_, shelf, new SavePageModel(this, download_)));
@@ -561,7 +561,6 @@ void SavePackage::Stop() {
   wait_state_ = FAILED;
 
   // Inform the DownloadItem we have canceled whole save page job.
-  DCHECK(download_);
   download_->Cancel(false);
 }
 
@@ -612,7 +611,6 @@ void SavePackage::Finish() {
                         &SaveFileManager::RemoveSavedFileFromFileMap,
                         save_ids));
 
-  DCHECK(download_);
   download_->Finished(all_save_items_count_);
 }
 
@@ -632,7 +630,6 @@ void SavePackage::SaveFinished(int32 save_id, int64 size, bool is_success) {
   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());
 
@@ -674,7 +671,6 @@ void SavePackage::SaveFailed(const GURL& save_url) {
   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());
 
@@ -992,6 +988,7 @@ FilePath SavePackage::GetSuggestNameForSaveAs(PrefService* prefs,
   // 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));
 
@@ -1041,7 +1038,6 @@ bool SavePackage::GetSaveInfo(const FilePath& suggest_name,
     index = 1;
   }
 
-  DCHECK(download_manager);
   // Ensure the filename is safe.
   download_manager->GenerateSafeFilename(param->current_tab_mime_type,
                                          &param->saved_main_file_path);