mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 134.0.6998.44
This commit is contained in:
committed by
Marshall Greenblatt
parent
2cb5ebb3db
commit
071f544b5a
@@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/134.0.6998.35'
|
'chromium_checkout': 'refs/tags/134.0.6998.44'
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -592,7 +592,7 @@ index 388954e9b504a..7fd8d7b36fa04 100644
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
|
||||||
index dc8800d422a2c..675410378cc6f 100644
|
index 3cc0bb183d1d1..57ea33377a7e4 100644
|
||||||
--- chrome/browser/prefs/browser_prefs.cc
|
--- chrome/browser/prefs/browser_prefs.cc
|
||||||
+++ chrome/browser/prefs/browser_prefs.cc
|
+++ chrome/browser/prefs/browser_prefs.cc
|
||||||
@@ -16,6 +16,7 @@
|
@@ -16,6 +16,7 @@
|
||||||
@@ -614,7 +614,7 @@ index dc8800d422a2c..675410378cc6f 100644
|
|||||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||||
#include "chrome/browser/accessibility/animation_policy_prefs.h"
|
#include "chrome/browser/accessibility/animation_policy_prefs.h"
|
||||||
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
|
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
|
||||||
@@ -1940,6 +1945,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
@@ -1937,6 +1942,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||||
|
|
||||||
// This is intentionally last.
|
// This is intentionally last.
|
||||||
RegisterLocalStatePrefsForMigration(registry);
|
RegisterLocalStatePrefsForMigration(registry);
|
||||||
@@ -626,7 +626,7 @@ index dc8800d422a2c..675410378cc6f 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Register prefs applicable to all profiles.
|
// Register prefs applicable to all profiles.
|
||||||
@@ -2390,6 +2400,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
@@ -2387,6 +2397,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||||
const std::string& locale) {
|
const std::string& locale) {
|
||||||
RegisterProfilePrefs(registry, locale);
|
RegisterProfilePrefs(registry, locale);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user