diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2018-02-20 18:51:06 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2018-02-20 18:51:06 +0000 |
| commit | 2312775f8ebc90aa20f4e45bd252816e24314844 (patch) | |
| tree | 34414a0b8d8a904cd0eb4023b41603862897f7c9 /www/chromium/files/patch-chrome_browser_browser__resources.grd | |
| parent | Update to 0.9704. (diff) | |
www/chromium: update to 63.0.3239.132
Submitted by: cpm
Obtained from: https://github.com/cpu82/freebsd-chromium
MFH: 2018Q1
Security: https://vuxml.freebsd.org/freebsd/e264e74e-ffe0-11e7-8b91-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/1d951e85-ffdb-11e7-8b91-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/82894193-ffd4-11e7-8b91-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/f8e72cd4-c66a-11e7-bb17-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/3cd46257-bbc5-11e7-a3bc-e8e0b747a45a.html
Security: https://vuxml.freebsd.org/freebsd/a692bffe-b6ad-11e7-a1c2-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_browser__resources.grd')
| -rw-r--r-- | www/chromium/files/patch-chrome_browser_browser__resources.grd | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd index ddd077c2383b..3d8ac8600f95 100644 --- a/www/chromium/files/patch-chrome_browser_browser__resources.grd +++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd @@ -1,6 +1,6 @@ ---- chrome/browser/browser_resources.grd.orig 2017-09-05 21:05:12.000000000 +0200 -+++ chrome/browser/browser_resources.grd 2017-09-07 19:30:41.365751000 +0200 -@@ -424,7 +424,7 @@ +--- chrome/browser/browser_resources.grd.orig 2017-12-15 02:04:08.000000000 +0100 ++++ chrome/browser/browser_resources.grd 2017-12-24 00:39:53.904855000 +0100 +@@ -370,7 +370,7 @@ <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" /> <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> </if> @@ -9,10 +9,10 @@ <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" /> </if> <if expr="is_android"> -@@ -674,7 +674,7 @@ - <if expr="not is_android and not is_ios"> - <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" /> +@@ -620,7 +620,7 @@ + <include name="IDR_WELCOME_WIN10_PIN_SMALL_WEBP" file="resources\welcome\win10\pin-small.webp" type="BINDATA" /> </if> + <include name="IDR_SSL_ERROR_ASSISTANT_PB" file="${root_gen_dir}/chrome/browser/resources/ssl/ssl_error_assistant/ssl_error_assistant.pb" use_base_dir="false" type="BINDATA" /> - <if expr="is_android or is_linux"> + <if expr="is_android or is_posix"> <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" compress="gzip" /> |