bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

alloy: Fix crash loading chrome://system

This commit is contained in:
Marshall Greenblatt 2023-12-04 17:20:06 -05:00
parent 26e06c4ddc
commit b024b7ddf2
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patch/patches/services_network_2622.patch
View File

@ -20,6 +20,28 @@ index 0a6c1f498b8fc..79e0cf27a7715 100644
auto* service = ConnectorsServiceFactory::GetForBrowserContext(profile);
// If the corresponding Connector policy isn't set, don't perform scans.
if (!service || !service->IsConnectorEnabled(connector))
diff --git chrome/browser/feedback/system_logs/log_sources/related_website_sets_source.cc chrome/browser/feedback/system_logs/log_sources/related_website_sets_source.cc
index 9f4750b283306..c00f77eefd4a7 100644
--- chrome/browser/feedback/system_logs/log_sources/related_website_sets_source.cc
+++ chrome/browser/feedback/system_logs/log_sources/related_website_sets_source.cc
@@ -8,6 +8,7 @@
#include "base/json/json_writer.h"
#include "base/values.h"
+#include "cef/libcef/features/runtime.h"
#include "chrome/browser/first_party_sets/first_party_sets_policy_service.h"
#include "chrome/browser/first_party_sets/first_party_sets_policy_service_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -49,6 +50,9 @@ const char* GetSiteType(const net::SiteType type) {
// "PrimarySites": [ "https://example2.com", "https://example2.com.co" ]
// } ]
std::string ComputeRelatedWebsiteSetsInfo() {
+ if (cef::IsAlloyRuntimeEnabled()) {
+ return "";
+ }
#if BUILDFLAG(IS_CHROMEOS_ASH)
Profile* profile = ProfileManager::GetActiveUserProfile();
#else
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index 392127630de15..af90e3a3e970d 100644
--- chrome/browser/net/profile_network_context_service.cc