mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 132.0.6834.32
This commit is contained in:
committed by
Marshall Greenblatt
parent
bd266efefe
commit
fd43a8bf44
@ -7,5 +7,5 @@
|
|||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/132.0.6834.15'
|
'chromium_checkout': 'refs/tags/132.0.6834.32'
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
|
||||||
index 3914cb63eed91..f0dc36529a3c9 100644
|
index c2c22a92bccb2..c9af15f453f34 100644
|
||||||
--- chrome/browser/BUILD.gn
|
--- chrome/browser/BUILD.gn
|
||||||
+++ chrome/browser/BUILD.gn
|
+++ chrome/browser/BUILD.gn
|
||||||
@@ -12,6 +12,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
@@ -12,6 +12,7 @@ import("//build/config/compiler/pgo/pgo.gni")
|
||||||
|
@ -638,7 +638,7 @@ index 5d587e8473cb2..5fd83e7515ba5 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 a6002045888c4..6b96b3891822f 100644
|
index 7d352058fb59f..b8601eadec6e5 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 @@
|
||||||
@ -660,7 +660,7 @@ index a6002045888c4..6b96b3891822f 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"
|
||||||
@@ -1843,7 +1848,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
@@ -1851,7 +1856,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||||
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||||
#endif // BUILDFLAG(IS_WIN)
|
#endif // BUILDFLAG(IS_WIN)
|
||||||
|
|
||||||
@ -670,7 +670,7 @@ index a6002045888c4..6b96b3891822f 100644
|
|||||||
downgrade::RegisterPrefs(registry);
|
downgrade::RegisterPrefs(registry);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -1896,6 +1902,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
@@ -1904,6 +1910,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
|
||||||
|
|
||||||
// This is intentionally last.
|
// This is intentionally last.
|
||||||
RegisterLocalStatePrefsForMigration(registry);
|
RegisterLocalStatePrefsForMigration(registry);
|
||||||
@ -682,7 +682,7 @@ index a6002045888c4..6b96b3891822f 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Register prefs applicable to all profiles.
|
// Register prefs applicable to all profiles.
|
||||||
@@ -2344,6 +2355,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
@@ -2354,6 +2365,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
|
||||||
const std::string& locale) {
|
const std::string& locale) {
|
||||||
RegisterProfilePrefs(registry, locale);
|
RegisterProfilePrefs(registry, locale);
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ index ec7c90dc23958..0fa7a7110cf43 100644
|
|||||||
|
|
||||||
void BrowserCommandController::InitCommandState() {
|
void BrowserCommandController::InitCommandState() {
|
||||||
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
|
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
|
||||||
index 0d4b0fb263538..cdc472aa9f997 100644
|
index 7afe8d7942faf..17c0947c5576e 100644
|
||||||
--- chrome/browser/ui/toolbar/app_menu_model.cc
|
--- chrome/browser/ui/toolbar/app_menu_model.cc
|
||||||
+++ chrome/browser/ui/toolbar/app_menu_model.cc
|
+++ chrome/browser/ui/toolbar/app_menu_model.cc
|
||||||
@@ -715,10 +715,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel(
|
@@ -715,10 +715,12 @@ FindAndEditSubMenuModel::FindAndEditSubMenuModel(
|
||||||
@ -115,7 +115,7 @@ index 0d4b0fb263538..cdc472aa9f997 100644
|
|||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
@@ -1699,7 +1752,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
|
@@ -1700,7 +1753,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -124,7 +124,7 @@ index 0d4b0fb263538..cdc472aa9f997 100644
|
|||||||
GlobalError* error =
|
GlobalError* error =
|
||||||
GlobalErrorServiceFactory::GetForProfile(browser_->profile())
|
GlobalErrorServiceFactory::GetForProfile(browser_->profile())
|
||||||
->GetGlobalErrorByMenuItemCommandID(command_id);
|
->GetGlobalErrorByMenuItemCommandID(command_id);
|
||||||
@@ -1715,6 +1768,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
|
@@ -1716,6 +1769,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -155,7 +155,7 @@ index 0d4b0fb263538..cdc472aa9f997 100644
|
|||||||
bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
|
bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
|
||||||
if (command_id == IDC_VIEW_PASSWORDS ||
|
if (command_id == IDC_VIEW_PASSWORDS ||
|
||||||
command_id == IDC_SHOW_PASSWORD_MANAGER) {
|
command_id == IDC_SHOW_PASSWORD_MANAGER) {
|
||||||
@@ -1871,8 +1948,10 @@ void AppMenuModel::Build() {
|
@@ -1872,8 +1949,10 @@ void AppMenuModel::Build() {
|
||||||
IDS_CLEAR_BROWSING_DATA,
|
IDS_CLEAR_BROWSING_DATA,
|
||||||
kTrashCanRefreshIcon);
|
kTrashCanRefreshIcon);
|
||||||
|
|
||||||
@ -166,7 +166,7 @@ index 0d4b0fb263538..cdc472aa9f997 100644
|
|||||||
AddSeparator(ui::NORMAL_SEPARATOR);
|
AddSeparator(ui::NORMAL_SEPARATOR);
|
||||||
|
|
||||||
AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon);
|
AddItemWithStringIdAndVectorIcon(this, IDC_PRINT, IDS_PRINT, kPrintMenuIcon);
|
||||||
@@ -1968,6 +2047,11 @@ void AppMenuModel::Build() {
|
@@ -1969,6 +2048,11 @@ void AppMenuModel::Build() {
|
||||||
}
|
}
|
||||||
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
|
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
|
|
||||||
@ -683,7 +683,7 @@ index 3944e4463304d..9f09d246c0b6a 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
|
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
|
||||||
index 8addda3741841..5be1d534b9bd8 100644
|
index e02895e98e1ed..575b45ef62dab 100644
|
||||||
--- chrome/browser/ui/views/frame/browser_view.h
|
--- chrome/browser/ui/views/frame/browser_view.h
|
||||||
+++ chrome/browser/ui/views/frame/browser_view.h
|
+++ chrome/browser/ui/views/frame/browser_view.h
|
||||||
@@ -137,11 +137,16 @@ class BrowserView : public BrowserWindow,
|
@@ -137,11 +137,16 @@ class BrowserView : public BrowserWindow,
|
||||||
|
@ -133,10 +133,10 @@ index c579f65dce9f0..a04e0d1f66aaa 100644
|
|||||||
friend class test::InkDropHostTestApi;
|
friend class test::InkDropHostTestApi;
|
||||||
|
|
||||||
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
|
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
|
||||||
index 5b675ae814e09..bcea717c1a23b 100644
|
index f17cd72dbe014..e300516f3df7c 100644
|
||||||
--- ui/views/controls/button/label_button.cc
|
--- ui/views/controls/button/label_button.cc
|
||||||
+++ ui/views/controls/button/label_button.cc
|
+++ ui/views/controls/button/label_button.cc
|
||||||
@@ -585,6 +585,12 @@ void LabelButton::OnThemeChanged() {
|
@@ -596,6 +596,12 @@ void LabelButton::OnThemeChanged() {
|
||||||
SchedulePaint();
|
SchedulePaint();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -246,10 +246,10 @@ index aeaf8e35f7eda..4b7cc3f03d3cf 100644
|
|||||||
+ [MinVersion=1] kEnd = 7,
|
+ [MinVersion=1] kEnd = 7,
|
||||||
};
|
};
|
||||||
diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
|
diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
|
||||||
index 9dc4c165beecb..26a1c56f2c9d7 100644
|
index e51966febabea..0bf553721be40 100644
|
||||||
--- ui/ozone/platform/x11/x11_window.cc
|
--- ui/ozone/platform/x11/x11_window.cc
|
||||||
+++ ui/ozone/platform/x11/x11_window.cc
|
+++ ui/ozone/platform/x11/x11_window.cc
|
||||||
@@ -1861,7 +1861,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
@@ -1877,7 +1877,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
||||||
req.border_pixel = 0;
|
req.border_pixel = 0;
|
||||||
|
|
||||||
bounds_in_pixels_ = SanitizeBounds(bounds);
|
bounds_in_pixels_ = SanitizeBounds(bounds);
|
||||||
|
Reference in New Issue
Block a user