mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 87.0.4280.0 (#812852)
- Windows: VS2015 Update 2 is now the minimum version requirement for linking cef_sandbox from official build binary distributions.
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
|
||||
index df4b0a7c9bb0..140574fe2886 100644
|
||||
index d14bc858f566..0c9e50916bb1 100644
|
||||
--- ui/base/resource/resource_bundle.cc
|
||||
+++ ui/base/resource/resource_bundle.cc
|
||||
@@ -868,6 +868,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
|
||||
@@ -28,10 +28,10 @@ index df4b0a7c9bb0..140574fe2886 100644
|
||||
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
|
||||
DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
|
||||
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
|
||||
index 9cbc1d512acb..26b5f99f5214 100644
|
||||
index 317ad685e414..1d3935b2ae3d 100644
|
||||
--- ui/base/resource/resource_bundle.h
|
||||
+++ ui/base/resource/resource_bundle.h
|
||||
@@ -160,6 +160,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
|
||||
@@ -161,6 +161,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
|
||||
// Return the global resource loader instance.
|
||||
static ResourceBundle& GetSharedInstance();
|
||||
|
||||
|
Reference in New Issue
Block a user