Skip to content

Commit

Permalink
Merge pull request #4817 from brave/80.0.3987.132
Browse files Browse the repository at this point in the history
Upgrade from Chromium 80.0.3987.122 to Chromium 80.0.3987.132.
  • Loading branch information
bsclifton authored and mkarolin committed Mar 4, 2020
1 parent 4e5f240 commit 78a53be
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index bba001eb234d24e47a73760216557149df222fa4..f9da606a58a17232a9a43ba39221410d7102d4b1 100644
index 02faec526acf56c05150c1a87b90e3b57ddefd87..02bf274a7772ce1b303a9ea9f5540931fa44ba51 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=80
-MINOR=0
-BUILD=3987
-PATCH=122
-PATCH=132
+MINOR=1
+BUILD=4
+PATCH=95
2 changes: 1 addition & 1 deletion patches/chrome-android-java-AndroidManifest.xml.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 4a4ef4f6a6245b36b39f1f901bf13c6d8a8c42f8..4011af4a1c7232075ec94fe28716cf5e76b0d9d0 100644
index 4a4ef4f6a6245b36b39f1f901bf13c6d8a8c42f8..ddff3cddb53176ed3785389c2f341154dc90784a 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -979,7 +979,7 @@ by a child template that "extends" this file.
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 68b7b19de59a0114e070187944074366a216f232..6384ad689eb1753cbd3f5490f7355e12bd4cd5d3 100644
index 1087b7020dd88d2dca81d14f47fc541c472366f5..41eb3d67d65c9a68e3e772dee029dfc611407dab 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -284,14 +284,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = {
Expand All @@ -21,7 +21,7 @@ index 68b7b19de59a0114e070187944074366a216f232..6384ad689eb1753cbd3f5490f7355e12

const FeatureEntry::Choice kPassiveListenersChoices[] = {
{flags_ui::kGenericExperimentChoiceDefault, "", ""},
@@ -4833,6 +4833,7 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4838,6 +4838,7 @@ const FeatureEntry kFeatureEntries[] = {
// "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag
// Histograms" in tools/metrics/histograms/README.md (run the
// AboutFlagsHistogramTest unit test to verify this process).
Expand Down

0 comments on commit 78a53be

Please sign in to comment.