diff options
Diffstat (limited to 'www/iridium/files/patch-chrome_browser_browser__resources.grd')
| -rw-r--r-- | www/iridium/files/patch-chrome_browser_browser__resources.grd | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/www/iridium/files/patch-chrome_browser_browser__resources.grd b/www/iridium/files/patch-chrome_browser_browser__resources.grd index 979666f08c0c..c3bd477966d3 100644 --- a/www/iridium/files/patch-chrome_browser_browser__resources.grd +++ b/www/iridium/files/patch-chrome_browser_browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/browser_resources.grd.orig 2017-04-19 19:06:29 UTC -+++ chrome/browser/browser_resources.grd -@@ -383,7 +383,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" /> +--- chrome/browser/browser_resources.grd.orig 2018-06-13 00:10:04.000000000 +0200 ++++ chrome/browser/browser_resources.grd 2018-07-14 13:48:09.392254000 +0200 +@@ -634,7 +634,7 @@ + <include name="IDR_WELCOME_WIN10_PIN_WEBP" file="resources\welcome\pin.webp" type="BINDATA" /> </if> -- <if expr="desktop_linux or (is_android and enable_plugins)"> -+ <if expr="desktop_linux or (is_android and enable_plugins) or is_bsd"> - <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" /> + <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" /> + <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" type="BINDATA" compress="gzip" /> </if> - <if expr="is_android"> |