diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-12-11 08:17:16 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-12-11 08:40:32 +0000 |
| commit | 90af7f14c31aac1cc077d982b1a54972602ae2f6 (patch) | |
| tree | 02a794aa6427d3cd6ba7ffa372544251a1335e30 /www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc | |
| parent | 440f10be936ddbfdfd0158408604cc4926e7b493 (diff) | |
| download | ports-90af7f14c31aac1cc077d982b1a54972602ae2f6.tar.gz ports-90af7f14c31aac1cc077d982b1a54972602ae2f6.zip | |
www/chromium: update to 120.0.6099.71
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index e6fa06d7e530..f0e0ac80b052 100644 --- a/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/chromium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-10-11 18:22:24 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-12-10 06:10:27 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc -@@ -11,7 +11,7 @@ +@@ -10,7 +10,7 @@ #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/core/keyed_service.h" @@ -9,21 +9,21 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -42,7 +42,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - return IsDeviceTrustConnectorFeatureEnabled(); + return true; #else return false; -@@ -80,7 +80,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan +@@ -79,7 +79,7 @@ DeviceTrustConnectorServiceFactory::BuildServiceInstan std::unique_ptr<DeviceTrustConnectorService> service = std::make_unique<DeviceTrustConnectorService>(profile->GetPrefs()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (IsDeviceTrustConnectorFeatureEnabled()) { - auto* key_manager = g_browser_process->browser_policy_connector() - ->chrome_browser_cloud_management_controller() + auto* key_manager = g_browser_process->browser_policy_connector() + ->chrome_browser_cloud_management_controller() + ->GetDeviceTrustKeyManager(); |