Update to Chromium version 126.0.6478.127
This commit is contained in:
parent
300bb055bb
commit
047d3a0b4e
|
@ -7,5 +7,5 @@
|
|||
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
|
||||
|
||||
{
|
||||
'chromium_checkout': 'refs/tags/126.0.6478.115'
|
||||
'chromium_checkout': 'refs/tags/126.0.6478.127'
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git DEPS DEPS
|
||||
index 912065d31f140..5ad90457499d3 100644
|
||||
index cf0643c7479f8..1b8ca66068aa0 100644
|
||||
--- DEPS
|
||||
+++ DEPS
|
||||
@@ -2102,16 +2102,16 @@ deps = {
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
diff --git chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
index fb6998fb07eaf..6a46b927890c3 100644
|
||||
index 53ad57b10a919..5cb57dfa46b01 100644
|
||||
--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
|
||||
@@ -23,6 +23,7 @@
|
||||
|
@ -10,7 +10,7 @@ index fb6998fb07eaf..6a46b927890c3 100644
|
|||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/enterprise/connectors/analysis/analysis_settings.h"
|
||||
#include "chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.h"
|
||||
@@ -358,6 +359,11 @@ bool ContentAnalysisDelegate::IsEnabled(Profile* profile,
|
||||
@@ -362,6 +363,11 @@ bool ContentAnalysisDelegate::IsEnabled(Profile* profile,
|
||||
GURL url,
|
||||
Data* data,
|
||||
AnalysisConnector connector) {
|
||||
|
|
|
@ -259,7 +259,7 @@ index 2cf9330a4e24b..4bf0890ae000b 100644
|
|||
|
||||
// Specifies which edges of the window are tiled.
|
||||
diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
|
||||
index 94dc1654c3540..37f78f3f240b4 100644
|
||||
index 049ca2852542d..a1c6796dccaab 100644
|
||||
--- ui/ozone/platform/x11/x11_window.cc
|
||||
+++ ui/ozone/platform/x11/x11_window.cc
|
||||
@@ -1865,7 +1865,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
|
||||
|
|
Loading…
Reference in New Issue