rebase for 107.0.5304.107

This commit is contained in:
Carmelo Messina
2022-11-10 13:55:13 +01:00
parent 2a6c0d3a81
commit 14340a75a8
2 changed files with 3 additions and 3 deletions
@@ -43,7 +43,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3217,6 +3217,15 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] =
@@ -3212,6 +3212,15 @@ const char kWebrtcUseMinMaxVEADimensionsDescription[] =
"When enabled, WebRTC will only use the Video Encode Accelerator for "
"video resolutions inside those published as supported.";
@@ -62,7 +62,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1824,6 +1824,11 @@ extern const char kWebrtcSrtpAesGcmDescription[];
@@ -1821,6 +1821,11 @@ extern const char kWebrtcSrtpAesGcmDescription[];
extern const char kWebrtcUseMinMaxVEADimensionsName[];
extern const char kWebrtcUseMinMaxVEADimensionsDescription[];
@@ -14,7 +14,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -1554,6 +1554,11 @@ config("default_warnings") {
@@ -1558,6 +1558,11 @@ config("default_warnings") {
# TODO(https://crbug.com/1363759): Evaluate and possibly enable.
cflags += [ "-Wno-deprecated-copy-with-user-provided-copy" ]
}