From c632de89007206420dda32ace985612b2d6b5397 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Tue, 8 Sep 2020 22:52:59 -0700 Subject: [PATCH] Merge pull request #6589 from brave/85.0.4183.102_master_56 Upgrade patches from Chromium 85.0.4183.83 to Chromium 85.0.4183.102 --- patches/chrome-VERSION.patch | 4 ++-- patches/chrome-browser-ui-chrome_pages.cc.patch | 4 ++-- patches/tools-metrics-histograms-histograms.xml.patch | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index fffce5a07af0..e8e1c9771ab1 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -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=13 +PATCH=85 diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index 0c53f0be6bb7..a78a25b04045 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -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 } diff --git a/patches/tools-metrics-histograms-histograms.xml.patch b/patches/tools-metrics-histograms-histograms.xml.patch index cc28f966b5e8..335e9342739c 100644 --- a/patches/tools-metrics-histograms-histograms.xml.patch +++ b/patches/tools-metrics-histograms-histograms.xml.patch @@ -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. -->