mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 78.0.3904.0 (#693954)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
|
||||
index fa666755d5f3..779ebb5949cf 100644
|
||||
index 5b2f19834d43..db733ea25bdc 100644
|
||||
--- ui/base/resource/resource_bundle.cc
|
||||
+++ ui/base/resource/resource_bundle.cc
|
||||
@@ -809,6 +809,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
|
||||
@@ -817,6 +817,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
|
||||
: delegate_(delegate),
|
||||
locale_resources_data_lock_(new base::Lock),
|
||||
max_scale_factor_(SCALE_FACTOR_100P) {
|
||||
@@ -15,7 +15,7 @@ index fa666755d5f3..779ebb5949cf 100644
|
||||
mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
switches::kMangleLocalizedStrings);
|
||||
}
|
||||
@@ -818,6 +824,11 @@ ResourceBundle::~ResourceBundle() {
|
||||
@@ -826,6 +832,11 @@ ResourceBundle::~ResourceBundle() {
|
||||
UnloadLocaleResources();
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ index fa666755d5f3..779ebb5949cf 100644
|
||||
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
|
||||
DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
|
||||
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
|
||||
index f5a09173007e..36734b2ed811 100644
|
||||
index a342b41335a6..67bbffb9bbda 100644
|
||||
--- ui/base/resource/resource_bundle.h
|
||||
+++ ui/base/resource/resource_bundle.h
|
||||
@@ -155,6 +155,11 @@ class UI_BASE_EXPORT ResourceBundle {
|
||||
|
Reference in New Issue
Block a user