bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 116.0.5845.0 (#1160321)

Browse Source
This commit is contained in:
Marshall Greenblatt
2023-06-26 13:13:38 +03:00
parent 71c588c16a
commit 650755a092
72 changed files with 525 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patch/patches/chrome_browser_permission_prompt.patch
View File

@@ -44,7 +44,7 @@ index 16107572d4d0d..409e9ea870482 100644
base::FeatureList::IsEnabled(
features::kPeriodicSyncPermissionForDefaultSearchEngine) &&
diff --git chrome/browser/permissions/chrome_permissions_client.cc chrome/browser/permissions/chrome_permissions_client.cc
index dece5822d8899..855ab4273e916 100644
index 18e2eec8f64ff..d36b3206aeb63 100644
--- chrome/browser/permissions/chrome_permissions_client.cc
+++ chrome/browser/permissions/chrome_permissions_client.cc
@@ -14,6 +14,7 @@
@@ -65,7 +65,7 @@ index dece5822d8899..855ab4273e916 100644
return site_engagement::SiteEngagementService::Get(
Profile::FromBrowserContext(browser_context))
->GetScore(origin);
@@ -332,8 +336,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
@@ -338,8 +342,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
std::make_unique<ContextualNotificationPermissionUiSelector>());
selectors.emplace_back(std::make_unique<PrefNotificationPermissionUiSelector>(
Profile::FromBrowserContext(browser_context)));
@@ -77,7 +77,7 @@ index dece5822d8899..855ab4273e916 100644
}
diff --git chrome/browser/permissions/permission_manager_factory.cc chrome/browser/permissions/permission_manager_factory.cc
index e70f9fcc696e5..f61ee1548f8b0 100644
index bac111192fab1..695c240875c31 100644
--- chrome/browser/permissions/permission_manager_factory.cc
+++ chrome/browser/permissions/permission_manager_factory.cc
@@ -6,6 +6,7 @@
@@ -88,12 +88,12 @@ index e70f9fcc696e5..f61ee1548f8b0 100644
#include "chrome/browser/background_fetch/background_fetch_permission_context.h"
#include "chrome/browser/background_sync/periodic_background_sync_permission_context.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -59,8 +60,10 @@ permissions::PermissionManager::PermissionContextMap CreatePermissionContexts(
@@ -56,8 +57,10 @@ permissions::PermissionManager::PermissionContextMap CreatePermissionContexts(
std::make_unique<GeolocationPermissionContextDelegate>(profile);
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+ if (!cef::IsAlloyRuntimeEnabled()) {
delegates.geolocation_manager = g_browser_process->geolocation_manager();
delegates.geolocation_manager = device::GeolocationManager::GetInstance();
DCHECK(delegates.geolocation_manager);
+ }
#endif