mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 82.0.4085.0 (#749737)
- Building on macOS now requires the 10.15 SDK. Xcode 11.3 is recommended as Xcode 11.4 is not currently supported (see https://crbug.com/1065146). - Jumbo build configuration is no longer supported. Chromium is skipping the M82 release and consequently no CEF 4085 branch will be created. For details on the Chromium decision see https://groups.google.com/a/chromium.org/d/msg/chromium-dev/Vn7uzglqLz0/JItlSrZxBAAJ
This commit is contained in:
@@ -1,16 +1,16 @@
|
||||
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
|
||||
index 1610e0ecc707..f231d5033983 100644
|
||||
index 937b56a2e261..9e3877b06c59 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>
|
||||
@@ -8,6 +8,7 @@
|
||||
|
||||
#include "base/feature_list.h"
|
||||
#include "build/buildflag.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 @@
|
||||
@@ -19,6 +20,10 @@
|
||||
#include "content/public/browser/browser_thread.h"
|
||||
#include "extensions/buildflags/buildflags.h"
|
||||
|
||||
@@ -21,7 +21,7 @@ index 1610e0ecc707..f231d5033983 100644
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
#include "chrome/browser/extensions/extension_service.h"
|
||||
#include "extensions/browser/extension_system.h"
|
||||
@@ -45,8 +50,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
|
||||
@@ -47,8 +52,14 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
|
||||
DependsOn(SupervisedUserSettingsServiceFactory::GetInstance());
|
||||
#endif
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
@@ -36,8 +36,8 @@ index 1610e0ecc707..f231d5033983 100644
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -86,10 +97,16 @@ scoped_refptr<RefcountedKeyedService>
|
||||
base::FeatureList::IsEnabled(features::kPermissionDelegation)));
|
||||
@@ -89,10 +100,16 @@ scoped_refptr<RefcountedKeyedService>
|
||||
permissions::features::kPermissionDelegation)));
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
+#if BUILDFLAG(ENABLE_CEF)
|
||||
|
Reference in New Issue
Block a user