[AUTO] Patches auto-rebase for master branch (#2140)
[AUTO] Patches auto-rebase for master branch
This commit is contained in:
@@ -2052,7 +2052,7 @@ diff --git a/services/network/public/cpp/features.h b/services/network/public/cp
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -2924,4 +2924,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
|
||||
@@ -2931,4 +2931,5 @@ bool IsLinkPreviewTriggerTypeEnabled(LinkPreviewTriggerType type) {
|
||||
//
|
||||
// DO NOT ADD NEW FEATURES HERE.
|
||||
|
||||
@@ -2061,7 +2061,7 @@ diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/fea
|
||||
diff --git a/third_party/blink/public/common/features.h b/third_party/blink/public/common/features.h
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -1908,6 +1908,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
|
||||
@@ -1910,6 +1910,7 @@ BLINK_COMMON_EXPORT bool IsUpdateComplexSafaAreaConstraintsEnabled();
|
||||
//
|
||||
// DO NOT ADD NEW FEATURES HERE.
|
||||
|
||||
|
||||
@@ -385,7 +385,7 @@ new file mode 100644
|
||||
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -2868,6 +2868,7 @@ BASE_FEATURE(kNoReferrerForPreloadFromSubresource,
|
||||
@@ -2875,6 +2875,7 @@ BASE_FEATURE(kNoReferrerForPreloadFromSubresource,
|
||||
// constants for features in the section above.
|
||||
|
||||
bool IsAllowURNsInIframeEnabled() {
|
||||
|
||||
@@ -267,7 +267,7 @@ new file mode 100644
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -1025,6 +1025,12 @@ static_library("ui") {
|
||||
@@ -1029,6 +1029,12 @@ static_library("ui") {
|
||||
deps += [
|
||||
"//components/themes:ntp_background_proto",
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user