diff options
Diffstat (limited to 'www/chromium/files/patch-printing_print__settings.h')
| -rw-r--r-- | www/chromium/files/patch-printing_print__settings.h | 32 |
1 files changed, 7 insertions, 25 deletions
diff --git a/www/chromium/files/patch-printing_print__settings.h b/www/chromium/files/patch-printing_print__settings.h index af48434cab1a..db9e6887b65b 100644 --- a/www/chromium/files/patch-printing_print__settings.h +++ b/www/chromium/files/patch-printing_print__settings.h @@ -1,6 +1,6 @@ ---- printing/print_settings.h.orig 2021-12-14 11:45:09 UTC +--- printing/print_settings.h.orig 2022-02-07 13:39:41 UTC +++ printing/print_settings.h -@@ -18,11 +18,11 @@ +@@ -18,7 +18,7 @@ #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.h" @@ -9,24 +9,16 @@ #include <map> #include "base/values.h" --#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) - - namespace printing { - -@@ -66,9 +66,9 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -66,7 +66,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { } }; -#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) || defined(OS_CHROMEOS) -+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) - PrintSettings(); - PrintSettings(const PrintSettings&); -@@ -224,12 +224,12 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -221,7 +221,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { pages_per_sheet_ = pages_per_sheet; } @@ -35,13 +27,7 @@ AdvancedSettings& advanced_settings() { return advanced_settings_; } const AdvancedSettings& advanced_settings() const { return advanced_settings_; - } --#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) { -@@ -328,10 +328,10 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { +@@ -322,7 +322,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings { // Number of pages per sheet. int pages_per_sheet_; @@ -49,8 +35,4 @@ +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) // Advanced settings. AdvancedSettings advanced_settings_; --#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. + #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) |