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

Upgrade patches from Chromium 83.0.4103.97 to Chromium 83.0.4103.106 (1.11.x). #5862

Merged
merged 1 commit into from
Jun 16, 2020
Merged

Upgrade patches from Chromium 83.0.4103.97 to Chromium 83.0.4103.106 (1.11.x). #5862

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 ba31157c62367fc85f634202ea86bf9f1d886a99..9af5242a6434a9f88ba5f21e6ed0c561492124a9 100644
index 55ce8782eef44785822080761406d3a89591d61f..e40f275d13fb66bf235199168c3b2a007a61dcc5 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=83
-MINOR=0
-BUILD=4103
-PATCH=97
-PATCH=106
+MINOR=1
+BUILD=11
+PATCH=66
4 changes: 2 additions & 2 deletions ...s/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.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/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
index 8803c290bda481fc04cb03a4f07ddcc3dd92e551..1ad4ba14169b7051ec387b91d62d5ac8ec089837 100644
index 00399275b8f0cdc2b3e5efd073ae40b4b0ad0c6b..c99955bf7a2d43877bfa7d8c38d5cc07e23fde60 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java
@@ -92,7 +92,7 @@ import java.util.List;
Expand Down Expand Up @@ -62,7 +62,7 @@ index 8803c290bda481fc04cb03a4f07ddcc3dd92e551..1ad4ba14169b7051ec387b91d62d5ac8
mUrlFocusLayoutAnimator = new AnimatorSet();
mUrlFocusLayoutAnimator.playTogether(animators);

@@ -2850,6 +2856,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O
@@ -2851,6 +2857,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O

@Override
public void onBottomToolbarVisibilityChanged(boolean isVisible) {
Expand Down