From d5dace0a662e9cbafa7d1df92b9db067b5c7b2fb Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Sat, 23 Mar 2019 14:37:54 -0700 Subject: [PATCH] Update to Chromium 74.0.3729.28 Fixes https://github.com/brave/brave-browser/issues/3858 (redo of https://github.com/brave/brave-core/pull/2040 and https://github.com/brave/brave-core/pull/2044) --- app/brave_strings.grd | 4 ++-- app/generated_resources.grd | 5 ++++- patches/chrome-VERSION.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 2 +- .../chrome-browser-resources-bookmarks-toolbar.html.patch | 2 +- .../chrome-browser-resources-downloads-downloads.html.patch | 2 +- .../chrome-browser-resources-downloads-toolbar.html.patch | 2 +- patches/chrome-browser-resources-history-app.html.patch | 6 +++--- ...me-browser-resources-md_extensions-extensions.html.patch | 6 +++--- ...hrome-browser-resources-md_extensions-toolbar.html.patch | 2 +- .../chrome-browser-resources-settings-settings.html.patch | 4 ++-- ...er-resources-settings-settings_ui-settings_ui.html.patch | 2 +- ...ome-browser-ui-views-download-download_item_view.h.patch | 2 +- patches/content-browser-BUILD.gn.patch | 4 ++-- .../content-browser-frame_host-navigation_request.cc.patch | 4 ++-- patches/tools-metrics-histograms-histograms.xml.patch | 4 ++-- patches/ui-webui-resources-css-md_colors.css.patch | 2 +- 17 files changed, 30 insertions(+), 27 deletions(-) diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 26c4071f69c3..7e9485361e9b 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -906,10 +906,10 @@ Please check your email at $2jane.doe@example.com - If an image doesn’t have a useful description, Brave will try to provide one for you. Images are scanned by Brave. You can turn this off in settings at any time. + If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave. You can turn this off in settings at any time. - If an image doesn’t have a useful description, Brave will try to provide one for you. Images are scanned by Brave. + If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave. Brave can provide smarter spell-checking by sending what you type in the browser to Brave servers, allowing you to use the same spell-checking technology used by Brave search. diff --git a/app/generated_resources.grd b/app/generated_resources.grd index f3ddcf8f5d45..8f07768b0a26 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -5282,6 +5282,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Attach <a href="#" id="bluetooth-logs-info-link">Bluetooth Logs</a> (Brave internal) + + This information helps us better understand your Assistant issue. It’s stored for up to 90 days and access is restricted to appropriate engineering and feedback teams. + To better diagnose Bluetooth issues, Bravers can include additional Bluetooth logs with their feedback reports. When this option is checked, your report will include btsnoop and HCI logs from your current session, sanitized to remove as much PII as possible. Access to these logs will be restricted to managers of the Brave OS product group in Listnr. Logs will be purged after 90 days. @@ -5300,7 +5303,7 @@ Keep your key file in a safe place. You will need it to create new versions of y - Info to debug Assistant + Include recent Assistant history via Sherlog. This may include your identity, location, and debug info <a href="#" id="assistant-logs-info-link">Learn more</a> File will be sent to Brave for debugging diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index de9953a29bf7..5650c719750f 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index c297dd1238e78265f494b98c3df92e8babf1b659..5f20f645d150e8371a35edacace3d6b5c6232b89 100644 +index 9ef745ce1196c3f3fa9f6553702eb86e56e2f3c9..e7a554213e5df572b5b7413f77aa39e83649b9ab 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=74 MINOR=0 -BUILD=3729 --PATCH=22 +-PATCH=28 +BUILD=64 +PATCH=17 diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 232cd284ffd2..e72a05507850 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index b7d1ed834546af82571f44f4ba0c1cacacaa6d07..916ade98f4016a149bc988d91a2fca1799dd437e 100644 +index 58400e87d875ea675310cd94c2269cf82f4af351..531c24c8b7324e746c5ac09457aa78d658028e03 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -261,14 +261,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { diff --git a/patches/chrome-browser-resources-bookmarks-toolbar.html.patch b/patches/chrome-browser-resources-bookmarks-toolbar.html.patch index cbd4d911f574..ce8ba55ba8d1 100644 --- a/patches/chrome-browser-resources-bookmarks-toolbar.html.patch +++ b/patches/chrome-browser-resources-bookmarks-toolbar.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/toolbar.html b/chrome/browser/resources/bookmarks/toolbar.html -index 715f1e9838b53108874d265b25d57ae204f47302..1a9459da4d8d85d0cbb0143aa9a2d47daf3ea151 100644 +index d6579e9783a4bcdeee441a3824fec30f754b93d5..2f807f8f6466bc65f28f52f62176c747f1ab8589 100644 --- a/chrome/browser/resources/bookmarks/toolbar.html +++ b/chrome/browser/resources/bookmarks/toolbar.html @@ -1,7 +1,7 @@ diff --git a/patches/chrome-browser-resources-downloads-downloads.html.patch b/patches/chrome-browser-resources-downloads-downloads.html.patch index 190aab850ac5..85b98c805ba3 100644 --- a/patches/chrome-browser-resources-downloads-downloads.html.patch +++ b/patches/chrome-browser-resources-downloads-downloads.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html -index 2397587630137c2085309b970da082a1a2ba39e8..4958faca16bea40aa4e6d879d5fd0abc1393ace8 100644 +index dcb81efa7c7e18d410a35e451d747060c496462f..a6ed97244e6b1af5b5fe485e58ae6e1ecc24ba90 100644 --- a/chrome/browser/resources/downloads/downloads.html +++ b/chrome/browser/resources/downloads/downloads.html @@ -5,6 +5,7 @@ diff --git a/patches/chrome-browser-resources-downloads-toolbar.html.patch b/patches/chrome-browser-resources-downloads-toolbar.html.patch index 109457799e47..52b5c6a70082 100644 --- a/patches/chrome-browser-resources-downloads-toolbar.html.patch +++ b/patches/chrome-browser-resources-downloads-toolbar.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/toolbar.html b/chrome/browser/resources/downloads/toolbar.html -index f9b804f8fc9ba1cae31983f2298e79cab4ccf418..91bddad6b5175a87058c7f521c1eb82f64a5fa00 100644 +index 80fc546b5f2c9d33bef680172701d2feecc78252..7025217e758ce61ce4296cf24fb3671220f0d316 100644 --- a/chrome/browser/resources/downloads/toolbar.html +++ b/chrome/browser/resources/downloads/toolbar.html @@ -3,7 +3,7 @@ diff --git a/patches/chrome-browser-resources-history-app.html.patch b/patches/chrome-browser-resources-history-app.html.patch index 51ca3e4415e6..d8c2dff46064 100644 --- a/patches/chrome-browser-resources-history-app.html.patch +++ b/patches/chrome-browser-resources-history-app.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/history/app.html b/chrome/browser/resources/history/app.html -index 8579929ca2c3b7bd280ceb2953d0bcfbe111cf99..dd15a6f9f991c687a1c7bc2022cd849482cdf095 100644 +index 736edaf8f1d13ca634b95fd474bf53a06bdd20d6..031eeff954ccb6484a03e7af19205ccd3bbebd29 100644 --- a/chrome/browser/resources/history/app.html +++ b/chrome/browser/resources/history/app.html -@@ -96,6 +96,7 @@ +@@ -92,6 +92,7 @@ query-result="[[queryResult_]]" path="history"> @@ -10,7 +10,7 @@ index 8579929ca2c3b7bd280ceb2953d0bcfbe111cf99..dd15a6f9f991c687a1c7bc2022cd8494 diff --git a/patches/chrome-browser-resources-md_extensions-extensions.html.patch b/patches/chrome-browser-resources-md_extensions-extensions.html.patch index 92bf2c445fce..9a3706c7a3e4 100644 --- a/patches/chrome-browser-resources-md_extensions-extensions.html.patch +++ b/patches/chrome-browser-resources-md_extensions-extensions.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/md_extensions/extensions.html b/chrome/browser/resources/md_extensions/extensions.html -index 42461d4e40d26889bce3aaa363c0992227aaa64e..cb5ddff7e494a64ffd0c0b5cb26df7be6f027c7e 100644 +index 088cee5cf802262eaaf5806d4b68ebc52a24f002..0945c0ff35a00d025e76bf6e967904b106ca0f26 100644 --- a/chrome/browser/resources/md_extensions/extensions.html +++ b/chrome/browser/resources/md_extensions/extensions.html @@ -21,7 +21,7 @@ @@ -10,10 +10,10 @@ index 42461d4e40d26889bce3aaa363c0992227aaa64e..cb5ddff7e494a64ffd0c0b5cb26df7be + html.loading::before { background: var(--md-toolbar-color); - height: 56px; + height: var(--md-toolbar-height); @@ -43,7 +43,11 @@ html[dark].loading.in-dev-mode body::before { - border-bottom: 1px solid rgba(255, 255, 255, .1); + border-bottom: var(--md-toolbar-border); } - + diff --git a/patches/chrome-browser-resources-md_extensions-toolbar.html.patch b/patches/chrome-browser-resources-md_extensions-toolbar.html.patch index cd9fac0b4cde..1cef749efad2 100644 --- a/patches/chrome-browser-resources-md_extensions-toolbar.html.patch +++ b/patches/chrome-browser-resources-md_extensions-toolbar.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/md_extensions/toolbar.html b/chrome/browser/resources/md_extensions/toolbar.html -index 5e3eec9f88061e4670e54386066bd151bda1f651..63f154ef46ead9b8b9a05393d18aa9adbd7d8ecd 100644 +index 6f3b663fdf1dfe3098c39508f55cd74f9e7bb36e..6199623b0c4710b81ed59c19a5e9d8c6f75861f9 100644 --- a/chrome/browser/resources/md_extensions/toolbar.html +++ b/chrome/browser/resources/md_extensions/toolbar.html @@ -2,7 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings.html.patch b/patches/chrome-browser-resources-settings-settings.html.patch index 98e6317441c2..62bb2b8563a7 100644 --- a/patches/chrome-browser-resources-settings-settings.html.patch +++ b/patches/chrome-browser-resources-settings-settings.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.html b/chrome/browser/resources/settings/settings.html -index 60fc7482f59c5376ba1b217327052a5a5eb32b92..9b761afb13c929006383b68e5154496f75784093 100644 +index c99aed2da137c1e9797c3775852701c955556202..c7be763fbac06633054143a88dd4faee1c14e90b 100644 --- a/chrome/browser/resources/settings/settings.html +++ b/chrome/browser/resources/settings/settings.html @@ -8,6 +8,7 @@ @@ -10,7 +10,7 @@ index 60fc7482f59c5376ba1b217327052a5a5eb32b92..9b761afb13c929006383b68e5154496f