diff options
| -rw-r--r-- | chrome/browser/download/save_package_file_picker.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/download/save_page_browsertest.cc | 7 | ||||
| -rw-r--r-- | content/browser/download/save_package.cc | 6 | ||||
| -rw-r--r-- | content/browser/download/save_package_unittest.cc | 6 |
4 files changed, 5 insertions, 16 deletions
diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc index 4d5f7dc..439bad9 100644 --- a/chrome/browser/download/save_package_file_picker.cc +++ b/chrome/browser/download/save_package_file_picker.cc @@ -76,8 +76,8 @@ void AddHtmlOnlyFileTypeInfo( l10n_util::GetStringUTF16(IDS_SAVE_PAGE_DESC_HTML_ONLY)); std::vector<base::FilePath::StringType> extensions; - extensions.push_back(FILE_PATH_LITERAL("htm")); extensions.push_back(FILE_PATH_LITERAL("html")); + extensions.push_back(FILE_PATH_LITERAL("htm")); if (!extra_extension.empty()) extensions.push_back(extra_extension); file_type_info->extensions.push_back(extensions); diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 586a0d7..07a004e 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -177,12 +177,7 @@ bool DownloadStoredProperly( const base::FilePath::CharType kTestDir[] = FILE_PATH_LITERAL("save_page"); -static const char kAppendedExtension[] = -#if defined(OS_WIN) - ".htm"; -#else - ".html"; -#endif +static const char kAppendedExtension[] = ".html"; // Loosely based on logic in DownloadTestObserver. class DownloadItemCreatedObserver : public DownloadManager::Observer { diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc index 90ab2a50..a37035d 100644 --- a/content/browser/download/save_package.cc +++ b/content/browser/download/save_package.cc @@ -133,11 +133,7 @@ class SavePackageRequestHandle : public DownloadRequestHandleInterface { } // namespace const base::FilePath::CharType SavePackage::kDefaultHtmlExtension[] = -#if defined(OS_WIN) - FILE_PATH_LITERAL("htm"); -#else FILE_PATH_LITERAL("html"); -#endif SavePackage::SavePackage(WebContents* web_contents, SavePageType save_type, @@ -471,7 +467,7 @@ bool SavePackage::GenerateFileName(const std::string& disposition, file_path.RemoveExtension().BaseName().value(); base::FilePath::StringType file_name_ext = file_path.Extension(); - // If it is HTML resource, use ".htm{l,}" as its extension. + // If it is HTML resource, use ".html" as its extension. if (need_html_ext) { file_name_ext = FILE_PATH_LITERAL("."); file_name_ext.append(kDefaultHtmlExtension); diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc index b0e38c0..123af98 100644 --- a/content/browser/download/save_package_unittest.cc +++ b/content/browser/download/save_package_unittest.cc @@ -19,12 +19,10 @@ namespace content { #define FPL FILE_PATH_LITERAL +#define HTML_EXTENSION ".html" #if defined(OS_WIN) -#define HTML_EXTENSION ".htm" -// This second define is needed because MSVC is broken. -#define FPL_HTML_EXTENSION L".htm" +#define FPL_HTML_EXTENSION L".html" #else -#define HTML_EXTENSION ".html" #define FPL_HTML_EXTENSION ".html" #endif |