diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-06-27 11:18:24 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-07-03 09:38:30 +0000 |
| commit | d94af01c90575348c4e81a418257f254b6f8d225 (patch) | |
| tree | 77a26669b33eaa4d46b88b07e17dacc61eba6001 /chromium/chrome/browser/resources/settings/os_settings_resources.grd | |
| parent | 5d87695f37678f96492b258bbab36486c59866b4 (diff) | |
BASELINE: Update Chromium to 75.0.3770.116
Change-Id: Ifcd5227841577e8ce81a1b7a54c56caba4d85e02
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'chromium/chrome/browser/resources/settings/os_settings_resources.grd')
| -rw-r--r-- | chromium/chrome/browser/resources/settings/os_settings_resources.grd | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/chromium/chrome/browser/resources/settings/os_settings_resources.grd b/chromium/chrome/browser/resources/settings/os_settings_resources.grd index 71961bb6878..954acb49036 100644 --- a/chromium/chrome/browser/resources/settings/os_settings_resources.grd +++ b/chromium/chrome/browser/resources/settings/os_settings_resources.grd @@ -665,12 +665,22 @@ <structure name="IDR_OS_SETTINGS_ADDRESS_EDIT_DIALOG_JS" file="autofill_page/address_edit_dialog.js" type="chrome_html" /> + <if expr="chromeos"> + <structure name="IDR_OS_SETTINGS_BLOCKING_REQUEST_MANAGER_HTML" + file="autofill_page/blocking_request_manager.html" + type="chrome_html" /> + <structure name="IDR_OS_SETTINGS_BLOCKING_REQUEST_MANAGER_JS" + file="autofill_page/blocking_request_manager.js" + type="chrome_html" /> + </if> <structure name="IDR_OS_SETTINGS_SHOW_PASSWORD_BEHAVIOR_HTML" file="autofill_page/show_password_behavior.html" - type="chrome_html" /> + type="chrome_html" + preprocess="true" /> <structure name="IDR_OS_SETTINGS_SHOW_PASSWORD_BEHAVIOR_JS" file="autofill_page/show_password_behavior.js" - type="chrome_html" /> + type="chrome_html" + preprocess="true" /> <structure name="IDR_OS_SETTINGS_PASSWORD_LIST_ITEM_HTML" file="autofill_page/password_list_item.html" type="chrome_html" @@ -686,7 +696,8 @@ type="chrome_html" /> <structure name="IDR_OS_SETTINGS_PASSWORDS_SECTION_HTML" file="autofill_page/passwords_section.html" - type="chrome_html" /> + type="chrome_html" + preprocess="true" /> <structure name="IDR_OS_SETTINGS_PASSWORDS_SECTION_JS" file="autofill_page/passwords_section.js" type="chrome_html" @@ -700,10 +711,12 @@ type="chrome_html" /> <structure name="IDR_OS_SETTINGS_PASSWORDS_EXPORT_DIALOG_HTML" file="autofill_page/passwords_export_dialog.html" - type="chrome_html" /> + type="chrome_html" + preprocess="true" /> <structure name="IDR_OS_SETTINGS_PASSWORDS_EXPORT_DIALOG_JS" file="autofill_page/passwords_export_dialog.js" - type="chrome_html" /> + type="chrome_html" + preprocess="true" /> <structure name="IDR_OS_SETTINGS_PAYMENTS_SECTION_HTML" file="autofill_page/payments_section.html" type="chrome_html" /> |