Update to Chromium version 111.0.5563.0 (#1097615)

This commit is contained in:
Marshall Greenblatt
2023-01-30 12:43:54 -05:00
parent 4c41f14360
commit dc2231cdfb
179 changed files with 986 additions and 930 deletions

View File

@ -1,8 +1,8 @@
diff --git .gn .gn
index 53c9e4ec12aef..b303d299c49a9 100644
index a9b0a5a827fc8..9a0fd388756f3 100644
--- .gn
+++ .gn
@@ -155,6 +155,8 @@ exec_script_whitelist =
@@ -151,6 +151,8 @@ exec_script_whitelist =
"//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
"//chrome/version.gni",
@ -12,7 +12,7 @@ index 53c9e4ec12aef..b303d299c49a9 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 9075b6f33090b..21c669d061c44 100644
index 7cfadb4724141..e59835c875ec6 100644
--- BUILD.gn
+++ BUILD.gn
@@ -18,6 +18,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -23,16 +23,16 @@ index 9075b6f33090b..21c669d061c44 100644
import("//chrome/browser/buildflags.gni")
import("//components/nacl/features.gni")
import("//device/vr/buildflags/buildflags.gni")
@@ -115,6 +116,10 @@ group("gn_all") {
deps += [ "//third_party/abseil-cpp:absl_tests" ]
}
@@ -274,6 +275,10 @@ group("gn_all") {
deps += root_extra_deps
+ if (enable_cef) {
+ deps += [ "//cef" ]
+ }
+
if (enable_js_type_check) {
deps += [ ":webui_closure_compile" ]
if (enable_printing) {
deps += [ "//printing:printing_unittests" ]
}
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni
index d9024468296e7..11bfae65b7b02 100644
@ -80,7 +80,7 @@ index 60f573a736ba5..90dd6d0b37314 100644
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index 6b478cb901c0d..ba18b48249857 100644
index a16658689a69e..36515332da633 100644
--- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni
@@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.gni")
@ -91,7 +91,7 @@ index 6b478cb901c0d..ba18b48249857 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//extensions/buildflags/buildflags.gni")
@@ -72,6 +73,10 @@ template("chrome_repack_percent") {
@@ -73,6 +74,10 @@ template("chrome_repack_percent") {
"//ui/chromeos/resources",
]
}
@ -126,7 +126,7 @@ index adc881122cb9c..cafa71386fad6 100644
source_patterns +=
[ "${root_gen_dir}/extensions/strings/extensions_strings_" ]
diff --git chrome/installer/mini_installer/BUILD.gn chrome/installer/mini_installer/BUILD.gn
index 7fe3f49dafecd..8f3015f399b61 100644
index 4e6af9a522de5..b1851bc764355 100644
--- chrome/installer/mini_installer/BUILD.gn
+++ chrome/installer/mini_installer/BUILD.gn
@@ -6,6 +6,7 @@ import("//build/config/compiler/compiler.gni")
@ -137,7 +137,7 @@ index 7fe3f49dafecd..8f3015f399b61 100644
import("//chrome/process_version_rc_template.gni")
import("//components/nacl/features.gni")
import("//third_party/ffmpeg/ffmpeg_options.gni")
@@ -124,11 +125,13 @@ action("mini_installer_archive") {
@@ -121,11 +122,13 @@ action("mini_installer_archive") {
inputs = [
"$root_out_dir/chrome.dll",
"$root_out_dir/chrome.exe",
@ -151,9 +151,9 @@ index 7fe3f49dafecd..8f3015f399b61 100644
+ }
outputs = [
# See also chrome.packed.7z conditionally added below.
"$root_out_dir/chrome.7z",
diff --git tools/grit/grit_args.gni tools/grit/grit_args.gni
index bd7d65bdfa518..e7a68d7796bc8 100644
index 77f1be6116d0c..6bc41416af551 100644
--- tools/grit/grit_args.gni
+++ tools/grit/grit_args.gni
@@ -5,6 +5,7 @@
@ -164,7 +164,7 @@ index bd7d65bdfa518..e7a68d7796bc8 100644
import("//build/config/ui.gni")
shared_intermediate_dir = rebase_path(root_gen_dir, root_build_dir)
@@ -37,6 +38,8 @@ _grit_defines = [
@@ -36,6 +37,8 @@ _grit_defines = [
# Mac and iOS want Title Case strings.
"use_titlecase=${is_apple}",