mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 03:30:32 -04:00
d90bf58cf8
- Make existing patches apply cleanly Changelog: https://chromium.googlesource.com/chromium/src/+log/72.0.3626.121..73.0.3683.86?pretty=fuller&n=10000 Submitted by: Matthias Wolf MFH: 2019Q2
65 lines
3 KiB
C++
65 lines
3 KiB
C++
--- chrome/browser/download/download_prefs.cc.orig 2019-03-11 22:00:53 UTC
|
|
+++ chrome/browser/download/download_prefs.cc
|
|
@@ -62,7 +62,7 @@ namespace {
|
|
// Consider downloads 'dangerous' if they go to the home directory on Linux and
|
|
// to the desktop on any platform.
|
|
bool DownloadPathIsDangerous(const base::FilePath& download_path) {
|
|
-#if defined(OS_LINUX)
|
|
+#if defined(OS_LINUX) || defined(OS_BSD)
|
|
base::FilePath home_dir = base::GetHomeDir();
|
|
if (download_path == home_dir) {
|
|
return true;
|
|
@@ -155,7 +155,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
|
|
GetDefaultDownloadDirectoryForProfile()));
|
|
#endif // defined(OS_CHROMEOS)
|
|
|
|
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
|
|
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
|
should_open_pdf_in_system_reader_ =
|
|
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
|
|
#endif
|
|
@@ -252,7 +252,7 @@ void DownloadPrefs::RegisterProfilePrefs(
|
|
default_download_path);
|
|
registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
|
|
default_download_path);
|
|
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
|
|
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
|
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
|
|
#endif
|
|
#if defined(OS_ANDROID)
|
|
@@ -354,7 +354,7 @@ bool DownloadPrefs::IsDownloadPathManaged() 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) || defined(OS_BSD)
|
|
if (ShouldOpenPdfInSystemReader())
|
|
return true;
|
|
#endif
|
|
@@ -368,7 +368,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBasedOnExtension(
|
|
return false;
|
|
DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
|
|
extension.erase(0, 1);
|
|
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
|
|
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
|
if (base::FilePath::CompareEqualIgnoreCase(extension,
|
|
FILE_PATH_LITERAL("pdf")) &&
|
|
ShouldOpenPdfInSystemReader())
|
|
@@ -405,7 +405,7 @@ void DownloadPrefs::DisableAutoOpenBasedOnExtension(
|
|
SaveAutoOpenState();
|
|
}
|
|
|
|
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
|
|
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
|
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
|
|
if (should_open_pdf_in_system_reader_ == should_open)
|
|
return;
|
|
@@ -426,7 +426,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
|
|
#endif
|
|
|
|
void DownloadPrefs::ResetAutoOpen() {
|
|
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
|
|
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
|
|
SetShouldOpenPdfInSystemReader(false);
|
|
#endif
|
|
auto_open_.clear();
|