diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index a4bfbcde9c17..7565ed62ee3e 100644 --- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-05-12 22:05:44 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2021-07-19 18:45:09 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1293,11 +1293,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -1308,11 +1308,11 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, #endif // !defined(OS_MAC) && !defined(OS_CHROMEOS) @@ -14,24 +14,25 @@ #if !defined(OS_MAC) { key::kFullscreenAllowed, -@@ -1650,14 +1650,14 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -1663,7 +1663,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); #endif // defined(OS_ANDROID) --#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || \ ++#if defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || \ + defined(OS_CHROMEOS) handlers->AddHandler( std::make_unique< - enterprise_connectors::EnterpriseConnectorsPolicyHandler>( +@@ -1671,7 +1671,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH key::kContextAwareAccessSignalsAllowlist, enterprise_connectors::kContextAwareAccessSignalsAllowlistPref, chrome_schema)); --#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) -+#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) +-#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || ++#endif // defined(OS_LINUX) || defined(OS_MAC) || defined(OS_WIN) || defined(OS_BSD) || + // defined(OS_CHROMEOS) #if defined(OS_CHROMEOS) - handlers->AddHandler(std::make_unique<extensions::ExtensionListPolicyHandler>( -@@ -2012,13 +2012,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2028,13 +2028,13 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH SimpleSchemaValidatingPolicyHandler::RECOMMENDED_PROHIBITED, SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); @@ -47,7 +48,7 @@ #endif // BUILDFLAG(ENABLE_EXTENSIONS) -@@ -2031,7 +2031,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2056,7 +2056,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -56,7 +57,7 @@ handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, prefs::kAllowNativeNotifications, -@@ -2039,7 +2039,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH +@@ -2064,7 +2064,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH std::make_unique<SimplePolicyHandler>(key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, base::Value::Type::BOOLEAN))); |