mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 135.0.7049.0 (#1427262)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git chrome/browser/chrome_resource_bundle_helper.cc chrome/browser/chrome_resource_bundle_helper.cc
|
||||
index 0e256b2a268ca..66ef8460d46ca 100644
|
||||
index d1e99bf112b20..fee8571fab728 100644
|
||||
--- chrome/browser/chrome_resource_bundle_helper.cc
|
||||
+++ chrome/browser/chrome_resource_bundle_helper.cc
|
||||
@@ -68,8 +68,10 @@ extern void InitializeLocalState(
|
||||
@@ -63,8 +63,10 @@ extern void InitializeLocalState(
|
||||
|
||||
// Initializes the shared instance of ResourceBundle and returns the application
|
||||
// locale. An empty |actual_locale| value indicates failure.
|
||||
@@ -15,7 +15,7 @@ index 0e256b2a268ca..66ef8460d46ca 100644
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
// In order for SetLoadSecondaryLocalePaks() to work ResourceBundle must
|
||||
// not have been created yet.
|
||||
@@ -82,16 +84,8 @@ std::string InitResourceBundleAndDetermineLocale(PrefService* local_state,
|
||||
@@ -77,16 +79,8 @@ std::string InitResourceBundleAndDetermineLocale(PrefService* local_state,
|
||||
.empty());
|
||||
#endif
|
||||
|
||||
@@ -31,9 +31,9 @@ index 0e256b2a268ca..66ef8460d46ca 100644
|
||||
local_state->GetString(language::prefs::kApplicationLocale);
|
||||
-#endif
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
#if BUILDFLAG(IS_CHROMEOS)
|
||||
ui::ResourceBundle::SetLottieParsingFunctions(
|
||||
@@ -103,7 +97,8 @@ std::string InitResourceBundleAndDetermineLocale(PrefService* local_state,
|
||||
@@ -98,7 +92,8 @@ std::string InitResourceBundleAndDetermineLocale(PrefService* local_state,
|
||||
// On a POSIX OS other than ChromeOS, the parameter that is passed to the
|
||||
// method InitSharedInstance is ignored.
|
||||
std::string actual_locale = ui::ResourceBundle::InitSharedInstanceWithLocale(
|
||||
@@ -43,7 +43,7 @@ index 0e256b2a268ca..66ef8460d46ca 100644
|
||||
CHECK(!actual_locale.empty())
|
||||
<< "Locale could not be found for " << preferred_locale;
|
||||
|
||||
@@ -136,6 +131,7 @@ std::string InitResourceBundleAndDetermineLocale(PrefService* local_state,
|
||||
@@ -131,6 +126,7 @@ std::string InitResourceBundleAndDetermineLocale(PrefService* local_state,
|
||||
|
||||
std::string LoadLocalState(
|
||||
ChromeFeatureListCreator* chrome_feature_list_creator,
|
||||
@@ -51,7 +51,7 @@ index 0e256b2a268ca..66ef8460d46ca 100644
|
||||
bool is_running_tests) {
|
||||
base::FilePath user_data_dir;
|
||||
if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
|
||||
@@ -147,5 +143,6 @@ std::string LoadLocalState(
|
||||
@@ -142,5 +138,6 @@ std::string LoadLocalState(
|
||||
new ChromeCommandLinePrefStore(base::CommandLine::ForCurrentProcess()));
|
||||
|
||||
return InitResourceBundleAndDetermineLocale(
|
||||
|
Reference in New Issue
Block a user