Update to Chromium version 131.0.6778.13
This commit is contained in:
parent
a05b959543
commit
f8ad36e72c
|
@ -7,5 +7,5 @@
|
||||||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||||
|
|
||||||
{
|
{
|
||||||
'chromium_checkout': 'refs/tags/131.0.6778.0'
|
'chromium_checkout': 'refs/tags/131.0.6778.13'
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 d64fdb1c1bf43..954280f1c02e5 100644
|
index 31ad4d86787ac..435e19b1eac56 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")
|
||||||
|
|
|
@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc
|
diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc
|
||||||
index 2900434a50cf1..a2e8c6161ced2 100644
|
index 63b6bc3a35b40..91a9a3d42a7c1 100644
|
||||||
--- chrome/browser/devtools/devtools_window.cc
|
--- chrome/browser/devtools/devtools_window.cc
|
||||||
+++ chrome/browser/devtools/devtools_window.cc
|
+++ chrome/browser/devtools/devtools_window.cc
|
||||||
@@ -38,6 +38,7 @@
|
@@ -38,6 +38,7 @@
|
||||||
|
@ -88,7 +88,7 @@ index 2900434a50cf1..a2e8c6161ced2 100644
|
||||||
}
|
}
|
||||||
|
|
||||||
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
|
||||||
index 33631fd4086bf..25f16fe25b14e 100644
|
index 04bfa8a3f5229..535230f4997cf 100644
|
||||||
--- chrome/browser/ui/BUILD.gn
|
--- chrome/browser/ui/BUILD.gn
|
||||||
+++ chrome/browser/ui/BUILD.gn
|
+++ chrome/browser/ui/BUILD.gn
|
||||||
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
|
@@ -8,6 +8,7 @@ import("//build/config/compiler/compiler.gni")
|
||||||
|
@ -129,7 +129,7 @@ index 33631fd4086bf..25f16fe25b14e 100644
|
||||||
# TODO(crbug.com/41437292): Remove this circular dependency.
|
# TODO(crbug.com/41437292): Remove this circular dependency.
|
||||||
# Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".
|
# Any circular includes must depend on the target "//chrome/browser:browser_public_dependencies".
|
||||||
# These are all-platform circular includes.
|
# These are all-platform circular includes.
|
||||||
@@ -5509,6 +5519,7 @@ static_library("ui") {
|
@@ -5510,6 +5520,7 @@ static_library("ui") {
|
||||||
if (enable_printing) {
|
if (enable_printing) {
|
||||||
deps += [
|
deps += [
|
||||||
"//components/printing/browser",
|
"//components/printing/browser",
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
diff --git chrome/browser/printing/print_backend_service_manager.cc chrome/browser/printing/print_backend_service_manager.cc
|
diff --git chrome/browser/printing/print_backend_service_manager.cc chrome/browser/printing/print_backend_service_manager.cc
|
||||||
index 8fe9a3e263964..548609bc78b33 100644
|
index 9fbce2cb49a9f..0d870a0d293d0 100644
|
||||||
--- chrome/browser/printing/print_backend_service_manager.cc
|
--- chrome/browser/printing/print_backend_service_manager.cc
|
||||||
+++ chrome/browser/printing/print_backend_service_manager.cc
|
+++ chrome/browser/printing/print_backend_service_manager.cc
|
||||||
@@ -75,7 +75,15 @@ PrintBackendServiceManager* g_print_backend_service_manager_singleton = nullptr;
|
@@ -75,7 +75,15 @@ PrintBackendServiceManager* g_print_backend_service_manager_singleton = nullptr;
|
||||||
|
|
|
@ -254,7 +254,7 @@ index aae9bfa72f8f9..386cdead499f7 100644
|
||||||
std::unique_ptr<SelectionController> selection_controller_;
|
std::unique_ptr<SelectionController> selection_controller_;
|
||||||
|
|
||||||
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
|
||||||
index bbbc64c5f4644..516aaa1468d17 100644
|
index 901a933aa92a0..414d76b8b8992 100644
|
||||||
--- ui/views/controls/menu/menu_controller.cc
|
--- ui/views/controls/menu/menu_controller.cc
|
||||||
+++ ui/views/controls/menu/menu_controller.cc
|
+++ ui/views/controls/menu/menu_controller.cc
|
||||||
@@ -579,7 +579,8 @@ void MenuController::Run(Widget* parent,
|
@@ -579,7 +579,8 @@ void MenuController::Run(Widget* parent,
|
||||||
|
@ -283,7 +283,7 @@ index bbbc64c5f4644..516aaa1468d17 100644
|
||||||
if (item->GetParentMenuItem()) {
|
if (item->GetParentMenuItem()) {
|
||||||
params.context = item->GetWidget();
|
params.context = item->GetWidget();
|
||||||
// (crbug.com/1414232) The item to be open is a submenu. Make sure
|
// (crbug.com/1414232) The item to be open is a submenu. Make sure
|
||||||
@@ -2941,8 +2944,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
|
@@ -2955,8 +2958,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
|
||||||
|
|
||||||
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
MenuItemView* item = pending_state_.item;
|
MenuItemView* item = pending_state_.item;
|
||||||
|
@ -298,7 +298,7 @@ index bbbc64c5f4644..516aaa1468d17 100644
|
||||||
|
|
||||||
// Show the sub-menu.
|
// Show the sub-menu.
|
||||||
SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
|
SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
|
||||||
@@ -2962,8 +2970,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
@@ -2976,8 +2984,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
|
||||||
void MenuController::CloseSubmenu() {
|
void MenuController::CloseSubmenu() {
|
||||||
MenuItemView* item = state_.item;
|
MenuItemView* item = state_.item;
|
||||||
DCHECK(item);
|
DCHECK(item);
|
||||||
|
|
Loading…
Reference in New Issue