mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
a64237bcb0
Known issues: - The CefLoadCRLSetsFile function needs to be re-implemented (see issue #2497). - Linux: GTK2 support has been removed. The cefclient sample needs to be updated to use GTK3 (see issue #2014).
56 lines
2.1 KiB
Diff
56 lines
2.1 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 9596665e9320..c38584d4a222 100644
|
|
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
|
|
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
|
|
@@ -7,6 +7,7 @@
|
|
#include <utility>
|
|
|
|
#include "base/feature_list.h"
|
|
+#include "cef/libcef/features/features.h"
|
|
#include "chrome/browser/profiles/off_the_record_profile_impl.h"
|
|
#include "chrome/browser/profiles/profile.h"
|
|
#include "chrome/browser/search_engines/template_url_service_factory.h"
|
|
@@ -17,6 +18,10 @@
|
|
#include "content/public/browser/browser_thread.h"
|
|
#include "extensions/buildflags/buildflags.h"
|
|
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+#include "cef/libcef/common/extensions/extensions_util.h"
|
|
+#endif
|
|
+
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#include "chrome/browser/extensions/extension_service.h"
|
|
#include "extensions/browser/extension_system.h"
|
|
@@ -42,8 +47,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
|
|
DependsOn(SupervisedUserSettingsServiceFactory::GetInstance());
|
|
#endif
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ if (extensions::ExtensionsEnabled()) {
|
|
+#endif
|
|
DependsOn(
|
|
extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ }
|
|
+#endif
|
|
#endif
|
|
}
|
|
|
|
@@ -88,10 +99,16 @@ scoped_refptr<RefcountedKeyedService>
|
|
base::FeatureList::IsEnabled(features::kPermissionDelegation)));
|
|
|
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ if (extensions::ExtensionsEnabled()) {
|
|
+#endif
|
|
// These must be registered before before the HostSettings are passed over to
|
|
// the IOThread. Simplest to do this on construction.
|
|
extensions::ExtensionService::RegisterContentSettings(settings_map.get(),
|
|
profile);
|
|
+#if BUILDFLAG(ENABLE_CEF)
|
|
+ }
|
|
+#endif
|
|
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
|
|
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
|
|
SupervisedUserSettingsService* supervised_service =
|