Make default extension for downloading html "html" rather than "htm" on non-w...

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 45 matching lines @@
   SavePackageParam(const std::string& mime_type)
       : current_tab_mime_type(mime_type) { }
 };
 
 namespace {
 
 // Default name which will be used when we can not get proper name from
 // resource URL.
 const wchar_t kDefaultSaveName[] = L"saved_resource";
 
+const FilePath::CharType kDefaultHtmlExtension[] =
+#if defined(OS_WIN)
+    FILE_PATH_LITERAL("htm");
+#else
+    FILE_PATH_LITERAL("html");
+#endif
+
 // Maximum number of file ordinal number. I think it's big enough for resolving
 // name-conflict files which has same base file name.
 const int32 kMaxFileOrdinalNumber = 9999;
 
 // Maximum length for file path. Since Windows have MAX_PATH limitation for
 // file path, we need to make sure length of file path of every saved file
 // is less than MAX_PATH
 #if defined(OS_WIN)
 const uint32 kMaxFilePathLength = MAX_PATH - 1;
 #elif defined(OS_POSIX)
@@ skipping 212 matching lines @@
   // TODO(jungshik): Figure out the referrer charset when having one
   // makes sense and pass it to GetSuggestedFilename.
   FilePath file_path = FilePath::FromWStringHack(
       net::GetSuggestedFilename(url, disposition, "", kDefaultSaveName));
 
   DCHECK(!file_path.empty());
   FilePath::StringType pure_file_name =
       file_path.RemoveExtension().BaseName().value();
   FilePath::StringType file_name_ext = file_path.Extension();
 
-  // If it is HTML resource, use ".htm" as its extension name.
-  if (need_html_ext)
-    file_name_ext = FILE_PATH_LITERAL(".htm");
+  // If it is HTML resource, use ".htm{l,}" as its extension.
+  if (need_html_ext) {
+    file_name_ext = FILE_PATH_LITERAL(".");
+    file_name_ext.append(kDefaultHtmlExtension);
+  }
 
   // Get safe pure file name.
   if (!GetSafePureFileName(saved_main_directory_path_, file_name_ext,
                            kMaxFilePathLength, &pure_file_name))
     return false;
 
   FilePath::StringType file_name = pure_file_name + file_name_ext;
 
   // Check whether we already have same name.
   if (file_name_set_.find(file_name) == file_name_set_.end()) {
@@ skipping 670 matching lines @@
   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;
 }
 
 FilePath SavePackage::EnsureHtmlExtension(const FilePath& name) {
   // If the file name doesn't have an extension suitable for HTML files,
-  // append ".htm".
+  // append one.
   FilePath::StringType ext = file_util::GetFileExtensionFromPath(name);
   std::string mime_type;
   if (!net::GetMimeTypeFromExtension(ext, &mime_type) ||
       !CanSaveAsComplete(mime_type)) {
-    return FilePath(name.value() + FILE_PATH_LITERAL(".htm"));
+    return FilePath(name.value() + FILE_PATH_LITERAL(".") +
+                    kDefaultHtmlExtension);
   }
   return name;
 }
 
 void SavePackage::GetSaveInfo() {
   // Use "Web Page, Complete" option as default choice of saving page.
   int file_type_index = 2;
   SelectFileDialog::FileTypeInfo file_type_info;
   FilePath::StringType default_extension;
 
@@ skipping 15 matching lines @@
     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 = FILE_PATH_LITERAL("htm");
+    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) {
@@ skipping 113 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;
 }