Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 80.0.3987.122 to Chromium 80.0.3987.132. #4817

Merged
merged 1 commit into from
Mar 4, 2020
Merged

Upgrade from Chromium 80.0.3987.122 to Chromium 80.0.3987.132. #4817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions patches/chrome-VERSION.patch
View file
Open in desktop
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..19faa8c75a86e3b39ef606ad0f62f2d774d005d7 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=80
-MINOR=0
-BUILD=3987
-PATCH=122
-PATCH=132
+MINOR=1
+BUILD=7
+PATCH=36
2 changes: 1 addition & 1 deletion patches/chrome-android-java-res-layout-bottom_toolbar_browsing.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/chrome/android/java/res/layout/bottom_toolbar_browsing.xml b/chrome/android/java/res/layout/bottom_toolbar_browsing.xml
index 76d517641db816c12bd35ae6497cd172eea71fd0..34653dbf1849b43ada4dd34651ba9b3c6eab5596 100644
index 76d517641db816c12bd35ae6497cd172eea71fd0..4eec0ef3fc85ebd5f604d5869f86827f38afab64 100644
--- a/chrome/android/java/res/layout/bottom_toolbar_browsing.xml
+++ b/chrome/android/java/res/layout/bottom_toolbar_browsing.xml
@@ -16,9 +16,9 @@
Expand Down
4 changes: 2 additions & 2 deletions patches/chrome-browser-about_flags.cc.patch
View file
Open in desktop
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