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 patches from Chromium 77.0.3865.90 to Chromium 77.0.3865.120 #3659

Merged
merged 1 commit into from
Oct 10, 2019
Merged

Upgrade patches from Chromium 77.0.3865.90 to Chromium 77.0.3865.120 #3659

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,11 +1,11 @@
diff --git a/chrome/VERSION b/chrome/VERSION
index 5346a11c9cfb9dcc0dcbe1d9a1e016f51459817d..98da432c0a08c8441dc922c2ed4e9568bb9b3a35 100644
index 3d95bd18a5811839dd13c4209482b1d9694550b4..bbbe90995e67a88d085e6d139b1ed9a575d42e73 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=77
MINOR=0
-BUILD=3865
-PATCH=90
-PATCH=120
+BUILD=69
+PATCH=132
2 changes: 1 addition & 1 deletion patches/chrome-android-java-res-layout-toolbar_phone.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/toolbar_phone.xml b/chrome/android/java/res/layout/toolbar_phone.xml
index fe66549d3ac660c12186e0c9c78c7ed525f2015d..9f2fad8590812ececbf1b9d04ec493c2ed7da425 100644
index fe66549d3ac660c12186e0c9c78c7ed525f2015d..ca3724c9c28c4c73f1462413d8ae3c45157d7688 100644
--- a/chrome/android/java/res/layout/toolbar_phone.xml
+++ b/chrome/android/java/res/layout/toolbar_phone.xml
@@ -40,6 +40,7 @@
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-android-java-res-layout-toolbar_tablet.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/toolbar_tablet.xml b/chrome/android/java/res/layout/toolbar_tablet.xml
index 12630f4cd02676d1676eaea5617bf20689192697..b7a56a2411f439d3ac476bcf33f5996d5ef047ac 100644
index 12630f4cd02676d1676eaea5617bf20689192697..a0ce1391b34449efa0dadfaea0d783d31a9da8c8 100644
--- a/chrome/android/java/res/layout/toolbar_tablet.xml
+++ b/chrome/android/java/res/layout/toolbar_tablet.xml
@@ -75,6 +75,7 @@
Expand Down
2 changes: 1 addition & 1 deletion patches/chrome-browser-ui-views-profiles-profile_chooser_view.h.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/ui/views/profiles/profile_chooser_view.h b/chrome/browser/ui/views/profiles/profile_chooser_view.h
index 99ce6f5b3da37e72f94e7e672adb361a8268ef08..4f5ad40c7c2de59cbe5b648cbced6dc9c7db7819 100644
index 99ce6f5b3da37e72f94e7e672adb361a8268ef08..c7009bdbb49e3d26d8de4b3f1eb4498cf8d42d02 100644
--- a/chrome/browser/ui/views/profiles/profile_chooser_view.h
+++ b/chrome/browser/ui/views/profiles/profile_chooser_view.h
@@ -46,6 +46,8 @@ class ProfileChooserView : public ProfileMenuViewBase,
Expand Down
4 changes: 2 additions & 2 deletions patches/tools-metrics-histograms-histograms.xml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 9a5e6f5dfbf3a5b78108c2251f07ccbf0fe9b7e1..8902b60170f589ecc77079b95da7aedd427b9aa0 100644
index 5bf74b01450cfd34fb362863b2682b0ed6ae317d..d99456fd917fe279dde21f9b5691ba28d30b514d 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -165590,6 +165590,7 @@ regressions. -->
@@ -165600,6 +165600,7 @@ regressions. -->
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
Expand Down