summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_download_download__commands.cc
diff options
context:
space:
mode:
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.cc29
1 files changed, 22 insertions, 7 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 4f4c08e05c87..1eaffe80ffc5 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__commands.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -1,15 +1,24 @@
---- chrome/browser/download/download_commands.cc.orig 2019-04-30 22:22:33 UTC
+--- chrome/browser/download/download_commands.cc.orig 2019-07-24 18:58:09 UTC
+++ chrome/browser/download/download_commands.cc
-@@ -159,7 +159,7 @@ Browser* DownloadCommands::GetBrowser() const {
- return browser_displayer.browser();
+@@ -30,7 +30,7 @@
+ #include "net/base/url_util.h"
+ #include "ui/base/clipboard/scoped_clipboard_writer.h"
+
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ #include "chrome/browser/ui/browser.h"
+ #include "chrome/browser/ui/browser_finder.h"
+ #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
+@@ -157,7 +157,7 @@ void DownloadCommands::ExecuteCommand(Command command)
+ model_->ExecuteCommand(this, command);
}
-#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 = model_->GetTargetFilePath();
- return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -176,7 +176,7 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
+
+ Browser* DownloadCommands::GetBrowser() const {
+ chrome::ScopedTabbedBrowserDisplayer browser_displayer(model_->profile());
+@@ -180,12 +180,12 @@ bool DownloadCommands::CanOpenPdfInSystemViewer() cons
return IsDownloadPdf() &&
(IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
: true);
@@ -18,3 +27,9 @@
return IsDownloadPdf();
#endif
}
+
+-#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+
+ void DownloadCommands::CopyFileAsImageToClipboard() {
+ if (model_->GetState() != download::DownloadItem::COMPLETE ||