mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-02-18 13:10:42 +01:00
2f1e782f62
Frame identifiers have changed from int64_t to string type. This is due to https://crbug.com/1502660 which removes access to frame routing IDs in the renderer process. New cross-process frame identifiers are 160-bit values (32-bit child process ID + 128-bit local frame token) and most easily represented as strings. All other frame-related expectations and behaviors remain the same.
71 lines
2.9 KiB
Diff
71 lines
2.9 KiB
Diff
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
|
|
index 36335ba63ee83..e14005d6a4e86 100644
|
|
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
|
|
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
|
|
@@ -9,6 +9,7 @@
|
|
#include "base/feature_list.h"
|
|
#include "build/build_config.h"
|
|
#include "build/buildflag.h"
|
|
+#include "cef/libcef/features/runtime.h"
|
|
#include "chrome/browser/content_settings/one_time_permission_provider.h"
|
|
#include "chrome/browser/permissions/one_time_permissions_tracker_factory.h"
|
|
#include "chrome/browser/profiles/off_the_record_profile_impl.h"
|
|
@@ -24,6 +25,10 @@
|
|
#include "extensions/buildflags/buildflags.h"
|
|
#include "ui/webui/webui_allowlist_provider.h"
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+#include "cef/libcef/common/extensions/extensions_util.h"
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#include "base/trace_event/trace_event.h"
|
|
#include "extensions/browser/api/content_settings/content_settings_custom_extension_provider.h"
|
|
@@ -64,7 +69,13 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
|
|
#endif
|
|
DependsOn(OneTimePermissionsTrackerFactory::GetInstance());
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) {
|
|
+#endif
|
|
DependsOn(extensions::ContentSettingsService::GetFactoryInstance());
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ }
|
|
+#endif
|
|
#endif
|
|
// Used by way of ShouldRestoreOldSessionCookies().
|
|
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
|
|
@@ -118,6 +129,9 @@ scoped_refptr<RefcountedKeyedService>
|
|
std::move(allowlist_provider));
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ if (!cef::IsAlloyRuntimeEnabled() || extensions::ExtensionsEnabled()) {
|
|
+#endif
|
|
// These must be registered before before the HostSettings are passed over to
|
|
// the IOThread. Simplest to do this on construction.
|
|
settings_map->RegisterProvider(
|
|
@@ -130,6 +144,9 @@ scoped_refptr<RefcountedKeyedService>
|
|
// the case where profile->IsOffTheRecord() is true? And what is the
|
|
// interaction with profile->IsGuestSession()?
|
|
false));
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ }
|
|
+#endif
|
|
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
|
supervised_user::SupervisedUserSettingsService* supervised_service =
|
|
diff --git components/content_settings/renderer/content_settings_agent_impl.cc components/content_settings/renderer/content_settings_agent_impl.cc
|
|
index 54c18d58aea64..66d3721a392ec 100644
|
|
--- components/content_settings/renderer/content_settings_agent_impl.cc
|
|
+++ components/content_settings/renderer/content_settings_agent_impl.cc
|
|
@@ -143,7 +143,7 @@ ContentSetting GetContentSettingFromRules(
|
|
return rule.GetContentSetting();
|
|
}
|
|
}
|
|
- NOTREACHED();
|
|
+ // NOTREACHED();
|
|
return CONTENT_SETTING_DEFAULT;
|
|
}
|
|
} // namespace
|