diff options
| author | Robert Nagy <rnagy@FreeBSD.org> | 2023-12-23 21:38:28 +0000 |
|---|---|---|
| committer | Robert Nagy <rnagy@FreeBSD.org> | 2023-12-23 21:40:09 +0000 |
| commit | 3f144c348f95ac9df705e7bc713c382e370589ad (patch) | |
| tree | 64e4e02cca28cc057f2a06deebbcd989e8a36613 /www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc | |
| parent | fe8a74f7f89cf9287f5162ffced3f0838a5e3552 (diff) | |
| download | ports-3f144c348f95ac9df705e7bc713c382e370589ad.tar.gz ports-3f144c348f95ac9df705e7bc713c382e370589ad.zip | |
www/ungoogled-chromium: update to 120.0.6099.129
Security: https://vuxml.freebsd.org/freebsd/1b2a8e8a-9fd5-11ee-86bb-a8a1599412c6.html
(cherry picked from commit 2b72ddf76578b82d7d146d5268cd88a00650b88f)
Diffstat (limited to 'www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc')
| -rw-r--r-- | www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index 5a1e4f07fc96..22b95bef86c3 100644 --- a/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/ungoogled-chromium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,4 +1,4 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-10-13 13:20:35 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2023-12-23 12:33:28 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc @@ -49,7 +49,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" @@ -15,10 +15,10 @@ -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" // nogncheck #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" -@@ -91,7 +91,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +@@ -90,7 +90,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); @@ -27,12 +27,12 @@ storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); -@@ -246,7 +246,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -245,7 +245,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (enterprise_connectors::IsDeviceTrustConnectorFeatureEnabled()) { - auto* browser_dm_token_storage = BrowserDMTokenStorage::Get(); - auto* device_management_service = GetDeviceManagementService(); + auto* browser_dm_token_storage = BrowserDMTokenStorage::Get(); + auto* device_management_service = GetDeviceManagementService(); + auto shared_url_loader_factory = GetSharedURLLoaderFactory(); |