Page MenuHomeFreeBSD
Differential D23984 Diff 69308 head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc

Changeset View

Standalone View

View Options

head/www/chromium/files/patch-chrome_browser_download_download__prefs.cc

--- chrome/browser/download/download_prefs.cc.orig 2019-12-16 21:51:23 UTC --- chrome/browser/download/download_prefs.cc.orig 2020-03-03 18:53:51 UTC
+++ chrome/browser/download/download_prefs.cc +++ chrome/browser/download/download_prefs.cc
@@ -63,7 +63,7 @@ namespace { @@ -63,7 +63,7 @@ namespace {
// Consider downloads 'dangerous' if they go to the home directory on Linux and // Consider downloads 'dangerous' if they go to the home directory on Linux and
// to the desktop on any platform. // to the desktop on any platform.
bool DownloadPathIsDangerous(const base::FilePath& download_path) { bool DownloadPathIsDangerous(const base::FilePath& download_path) {
-#if defined(OS_LINUX) -#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD) +#if defined(OS_LINUX) || defined(OS_BSD)
base::FilePath home_dir = base::GetHomeDir(); base::FilePath home_dir = base::GetHomeDir();
Show All 12 Lines@@ -261,7 +261,7 @@ void DownloadPrefs::RegisterProfilePrefs(
default_download_path); default_download_path);
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
default_download_path); default_download_path);
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif #endif
#if defined(OS_ANDROID) #if defined(OS_ANDROID)
@@ -358,7 +358,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { @@ -360,7 +360,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
} }
bool DownloadPrefs::IsAutoOpenUsed() const { bool DownloadPrefs::IsAutoOpenUsed() const {
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (ShouldOpenPdfInSystemReader()) if (ShouldOpenPdfInSystemReader())
return true; return true;
#endif #endif
@@ -372,7 +372,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension( @@ -374,7 +374,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
return false; return false;
DCHECK(extension[0] == base::FilePath::kExtensionSeparator); DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
extension.erase(0, 1); extension.erase(0, 1);
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (base::FilePath::CompareEqualIgnoreCase(extension, if (base::FilePath::CompareEqualIgnoreCase(extension,
FILE_PATH_LITERAL("pdf")) && FILE_PATH_LITERAL("pdf")) &&
ShouldOpenPdfInSystemReader()) ShouldOpenPdfInSystemReader())
@@ -409,7 +409,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension( @@ -411,7 +411,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
SaveAutoOpenState(); SaveAutoOpenState();
} }
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open) if (should_open_pdf_in_system_reader_ == should_open)
return; return;
@@ -430,7 +430,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons @@ -432,7 +432,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
#endif #endif
void DownloadPrefs::ResetAutoOpen() { void DownloadPrefs::ResetAutoOpen() {
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) +#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
SetShouldOpenPdfInSystemReader(false); SetShouldOpenPdfInSystemReader(false);
#endif #endif
auto_open_.clear(); auto_open_.clear();