diff options
| author | Joseph Mingrone <jrm@FreeBSD.org> | 2020-12-01 04:06:37 +0000 |
|---|---|---|
| committer | Joseph Mingrone <jrm@FreeBSD.org> | 2020-12-01 04:06:37 +0000 |
| commit | a0dbfe2fb016ec18b858d0857d8c3ce21662d29c (patch) | |
| tree | 0454226a8e0acc85a44cfa5e09502134947dbdef /www/chromium/files/patch-printing_print__settings.h | |
| parent | games/iqpuzzle: Update 1.2.0 -> 1.2.1 (diff) | |
www/chromium: Update to version 87.0.4280.66
Submitted by: Matthias Wolf, cem, rene
Obtained from: Some patches from OpenBSD port (robert@openbsd.org)
Notes
Notes:
svn path=/head/; revision=556709
Diffstat (limited to 'www/chromium/files/patch-printing_print__settings.h')
| -rw-r--r-- | www/chromium/files/patch-printing_print__settings.h | 48 |
1 files changed, 33 insertions, 15 deletions
diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index e508d33e39ca..fa3c1bda3d7d 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,38 +1,56 @@ ---- printing/print_settings.h.orig 2020-09-08 19:14:09 UTC +--- printing/print_settings.h.orig 2020-11-13 06:36:46 UTC +++ printing/print_settings.h -@@ -20,7 +20,7 @@ +@@ -19,11 +19,11 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) #include <map> #include "base/values.h" -@@ -69,7 +69,7 @@ +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + namespace printing { + +@@ -80,9 +80,9 @@ class PRINTING_EXPORT PrintSettings { } }; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) using AdvancedSettings = std::map<std::string, base::Value>; - #endif // defined(OS_LINUX) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) -@@ -206,7 +206,7 @@ + PrintSettings(); + PrintSettings(const PrintSettings&) = delete; +@@ -221,12 +221,12 @@ class PRINTING_EXPORT PrintSettings { pages_per_sheet_ = pages_per_sheet; } --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; -@@ -305,7 +305,7 @@ + } +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + void set_send_user_info(bool send_user_info) { +@@ -320,10 +320,10 @@ class PRINTING_EXPORT PrintSettings { // Number of pages per sheet. int pages_per_sheet_; --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Advanced settings. AdvancedSettings advanced_settings_; - #endif // defined(OS_LINUX) +-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) ++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + + #if defined(OS_CHROMEOS) + // Whether to send user info. |