diff options
Diffstat (limited to 'www/chromium/files/patch-printing_print__settings__conversion.cc')
| -rw-r--r-- | www/chromium/files/patch-printing_print__settings__conversion.cc | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/www/chromium/files/patch-printing_print__settings__conversion.cc b/www/chromium/files/patch-printing_print__settings__conversion.cc index c8746d07dd5e..a1cc46f226d9 100644 --- a/www/chromium/files/patch-printing_print__settings__conversion.cc +++ b/www/chromium/files/patch-printing_print__settings__conversion.cc @@ -1,22 +1,19 @@ ---- printing/print_settings_conversion.cc.orig 2021-04-14 18:41:07 UTC +--- printing/print_settings_conversion.cc.orig 2021-07-19 18:45:19 UTC +++ printing/print_settings_conversion.cc -@@ -213,8 +213,8 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -211,14 +211,14 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet + #endif + } - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if defined(OS_CHROMEOS) || \ -- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if defined(OS_CHROMEOS) || \ -+ ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)) && \ - defined(USE_CUPS)) +-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) ++#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)) const base::Value* advanced_settings = job_settings.FindDictKey(kSettingAdvancedSettings); -@@ -222,7 +222,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet + if (advanced_settings) { for (const auto& item : advanced_settings->DictItems()) settings->advanced_settings().emplace(item.first, item.second.Clone()); } --#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || -+#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD) || - // BUILDFLAG(IS_CHROMEOS_LACROS)) && defined(USE_CUPS)) +-#endif // defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(USE_CUPS)) ++#endif // defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_CUPS)) - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if defined(OS_CHROMEOS) + bool send_user_info = |