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 85.0.4183.83 to Chromium 85.0.4183.102 (1.14.x). #6603

Merged
merged 1 commit into from
Sep 10, 2020
Merged

Upgrade patches from Chromium 85.0.4183.83 to Chromium 85.0.4183.102 (1.14.x). #6603

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 78d3c53293990ef4c0ee15db7173afe402de9521..1e77231d6d27bc396c1b37350207e00d0e92bd84 100644
index f84109edef918ac04ca0d3070f8a9867984ab9ec..bd60e13a4dced6811d6cf4d5752560b1abad0a3f 100644
--- a/chrome/VERSION
+++ b/chrome/VERSION
@@ -1,4 +1,4 @@
MAJOR=85
-MINOR=0
-BUILD=4183
-PATCH=83
-PATCH=102
+MINOR=1
+BUILD=14
+PATCH=79
4 changes: 2 additions & 2 deletions patches/chrome-browser-ui-chrome_pages.cc.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 79a746ddcea9f2977b212042a951a4f48b7b1dde..7067711618c3aa5b4026bc809fe70c82fa904e41 100644
index 5db8b816edd267a1264bbde1ac0611d880870f2c..41ff3e0ab51d49e0fe79b4bad25368e8bd76af70 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -367,7 +367,7 @@ void ShowSlow(Browser* browser) {
@@ -370,7 +370,7 @@ void ShowSlow(Browser* browser) {
#endif
}

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 ffdfdf4c026dab77c024b2acd9588074ba816532..17a3ac21003da380d1376ceddc8c4513c0a0ae07 100644
index eb2f41324d405f9ef38cf8451a327d331a82d573..7f94798670dbff7a1882a7df8d9ac8a33c2c1fb4 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -208043,6 +208043,7 @@ regressions. -->
@@ -208052,6 +208052,7 @@ regressions. -->
<suffix name="ProtectedMedia" label="Protected media permission"/>
<suffix name="PushMessaging" label="Push messaging permission"/>
<suffix name="Quota" label="Quota permission"/>
Expand Down