diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_download_download__prefs.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_download_download__prefs.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc index 9788b073e178..e7659720c78d 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2017-01-26 00:49:08 UTC +--- chrome/browser/download/download_prefs.cc.orig 2017-03-09 20:04:28 UTC +++ chrome/browser/download/download_prefs.cc @@ -56,7 +56,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and @@ -16,9 +16,9 @@ -#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) || - prefs->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally); -@@ -215,7 +215,7 @@ void DownloadPrefs::RegisterProfilePrefs + prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); + #endif +@@ -213,7 +213,7 @@ void DownloadPrefs::RegisterProfilePrefs default_download_path); registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, default_download_path); @@ -27,7 +27,7 @@ registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif } -@@ -292,7 +292,7 @@ bool DownloadPrefs::IsDownloadPathManage +@@ -290,7 +290,7 @@ bool DownloadPrefs::IsDownloadPathManage } bool DownloadPrefs::IsAutoOpenUsed() const { @@ -36,7 +36,7 @@ if (ShouldOpenPdfInSystemReader()) return true; #endif -@@ -306,7 +306,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas +@@ -304,7 +304,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas return false; DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); @@ -45,16 +45,16 @@ if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) return true; #endif -@@ -340,7 +340,7 @@ void DownloadPrefs::DisableAutoOpenBased +@@ -338,7 +338,7 @@ void DownloadPrefs::DisableAutoOpenBased 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) { - should_open_pdf_in_system_reader_ = should_open || - profile_->GetPrefs()->GetBoolean(prefs::kPluginsAlwaysOpenPdfExternally); -@@ -365,7 +365,7 @@ void DownloadPrefs::DisableAdobeVersionC + if (should_open_pdf_in_system_reader_ == should_open) + return; +@@ -359,7 +359,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste #endif void DownloadPrefs::ResetAutoOpen() { |