Skip to content

Commit cb583aa

Browse files
bscliftonmkarolin
authored andcommitted
Merge pull request #7375 from brave/87.0.4280.101
Updated patches from Chromium 87.0.4280.88 to Chromium 87.0.4280.101.
1 parent 8a0b849 commit cb583aa

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

patches/chrome-VERSION.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
diff --git a/chrome/VERSION b/chrome/VERSION
2-
index b2816ea7b221cf12ba19fed3532f0fd1ac96a8b2..f1a6aeb7a31abfa5ea8c97bd03332548dd7d87cd 100644
2+
index 76571803a842259df7cb6742bd1a4a5cc9ebbfff..36a642c9c9d8b25fc63e9676bdeb7ba743696686 100644
33
--- a/chrome/VERSION
44
+++ b/chrome/VERSION
55
@@ -1,4 +1,4 @@
66
MAJOR=87
77
-MINOR=0
88
-BUILD=4280
9-
-PATCH=88
9+
-PATCH=101
1010
+MINOR=1
1111
+BUILD=19
1212
+PATCH=52

patches/chrome-browser-about_flags.cc.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
2-
index 89914fee86b0a87bb446d36e99aa0c1e75da7056..b1e390f2f3f82c9ddd07d45f100577b9a8876871 100644
2+
index 592ae87905215388106c3d8aca1a55e07da43ba4..388411a8387196e8aa8808c31d93cbea9eaabb88 100644
33
--- a/chrome/browser/about_flags.cc
44
+++ b/chrome/browser/about_flags.cc
55
@@ -294,14 +294,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
@@ -21,7 +21,7 @@ index 89914fee86b0a87bb446d36e99aa0c1e75da7056..b1e390f2f3f82c9ddd07d45f100577b9
2121

2222
const FeatureEntry::Choice kPassiveListenersChoices[] = {
2323
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
24-
@@ -6733,6 +6733,7 @@ const FeatureEntry kFeatureEntries[] = {
24+
@@ -6752,6 +6752,7 @@ const FeatureEntry kFeatureEntries[] = {
2525
// "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
2626
// Histograms" in tools/metrics/histograms/README.md (run the
2727
// AboutFlagsHistogramTest unit test to verify this process).

0 commit comments

Comments
 (0)