Changeset View
Changeset View
Standalone View
Standalone View
www/iridium/files/patch-printing_print__settings.cc
--- printing/print_settings.cc.orig 2023-04-22 17:45:15 UTC | --- printing/print_settings.cc.orig 2023-04-24 20:55:01 UTC | ||||
+++ printing/print_settings.cc | +++ printing/print_settings.cc | ||||
@@ -309,7 +309,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet | @@ -306,7 +306,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet | ||||
#endif | #endif | ||||
is_modifiable_ = settings.is_modifiable_; | is_modifiable_ = settings.is_modifiable_; | ||||
pages_per_sheet_ = settings.pages_per_sheet_; | pages_per_sheet_ = settings.pages_per_sheet_; | ||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) | +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) | ||||
for (const auto& item : settings.advanced_settings_) | for (const auto& item : settings.advanced_settings_) | ||||
advanced_settings_.emplace(item.first, item.second.Clone()); | advanced_settings_.emplace(item.first, item.second.Clone()); | ||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||||
@@ -353,7 +353,7 @@ void PrintSettings::Clear() { | @@ -348,7 +348,7 @@ void PrintSettings::Clear() { | ||||
#endif | #endif | ||||
is_modifiable_ = true; | is_modifiable_ = true; | ||||
pages_per_sheet_ = 1; | pages_per_sheet_ = 1; | ||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) | +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) | ||||
advanced_settings_.clear(); | advanced_settings_.clear(); | ||||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) | ||||
#if BUILDFLAG(IS_CHROMEOS) | #if BUILDFLAG(IS_CHROMEOS) |