diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2019-01-07 19:47:18 +0000 |
| commit | ab34cf48c6364f23214d9242e83eefd174f7f820 (patch) | |
| tree | ce7704d873ee687272322780c46fc9ddee28a619 /www/chromium/files/patch-chrome_browser_download_download__commands.cc | |
| parent | - Add CONFLICTS for security/snort3 (diff) | |
www/chromium: Update to 71.0.3578.98
Changelog: https://chromium.googlesource.com/chromium/src/+log/68.0.3440.106..71.0.3578.98?pretty=fuller&n=10000
PR: 233990
Submitted by: Matthias Wolf <freebsd@rheinwolf.de>
Reported by: nikolaibitinit@gmail.com
Reviewed by: rene, cpm
Approved by: rene, cpm
MFH: 2019Q1
Security: http://vuxml.freebsd.org/freebsd/546d4dd4-10ea-11e9-b407-080027ef1a23.html
Security: http://vuxml.freebsd.org/freebsd/720590df-10eb-11e9-b407-080027ef1a23.html
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_download_download__commands.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_download_download__commands.cc | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc index 4533799135cf..caeb17150ff7 100644 --- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc @@ -1,33 +1,15 @@ ---- chrome/browser/download/download_commands.cc.orig 2018-06-13 00:10:05.000000000 +0200 -+++ chrome/browser/download/download_commands.cc 2018-07-14 14:30:03.853964000 +0200 -@@ -249,7 +249,7 @@ - return download_item_->GetOpenWhenComplete() || - download_crx_util::IsExtensionDownload(*download_item_); - case ALWAYS_OPEN_TYPE: --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - if (CanOpenPdfInSystemViewer()) { - DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - content::DownloadItemUtils::GetBrowserContext(download_item_)); -@@ -293,7 +293,7 @@ - bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE); - DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( - content::DownloadItemUtils::GetBrowserContext(download_item_)); --#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) -+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD) - if (CanOpenPdfInSystemViewer()) { - prefs->SetShouldOpenPdfInSystemReader(!is_checked); - DownloadItemModel(download_item_) -@@ -408,7 +408,7 @@ +--- chrome/browser/download/download_commands.cc.orig 2018-12-03 21:16:39.000000000 +0100 ++++ chrome/browser/download/download_commands.cc 2018-12-05 14:35:24.756358000 +0100 +@@ -220,7 +220,7 @@ return browser_displayer.browser(); } -#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) bool DownloadCommands::IsDownloadPdf() const { - base::FilePath path = download_item_->GetTargetFilePath(); + base::FilePath path = model_->GetTargetFilePath(); return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); -@@ -425,7 +425,7 @@ +@@ -237,7 +237,7 @@ return IsDownloadPdf() && (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date : true); |