Commit 2d6f2b54 authored by Jordy Greenblatt's avatar Jordy Greenblatt Committed by Commit Bot

SettingsSplit: Remove unnecessary 'preprocess' attributes from grd

By searching the settings/chromeos folder [1] for the string "<if" [2],
I determined that there are only 4 files in it that have conditional
tags that require preprocessing, namely
-settings/chromeos/os_settings.html
-settings/chromeos/os_about_page/os_about_page.js
-settings/chromeos/os_about_page/os_about_page.html
-settings/chromeos/os_privacy_page/os_privacy_page.html

I suspect that the preprocess attributes were just not deleted when
those files were branched from browser settings.

This CL removes the preprocess=true attribute from every file from the
chromeos folder [1] in os_settings_resources.grd other than the 4
aforementioned files. It also adds preprocess="true" to
os_privacy_page.html, which has "<if expr..." conditional content but
did not have the attribute.

[1] https://cs.chromium.org/chromium/src/chrome/browser/resources/settings/chromeos/
[2] http://screen/X7uR9d0LJPf

Bug: 987384
Change-Id: Ifcf42add56ac4b79a41dfe783678236e58b5584c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715261Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Reviewed-by: default avatarMay Lippert <maybelle@chromium.org>
Commit-Queue: Jordy Greenblatt <jordynass@chromium.org>
Cr-Commit-Position: refs/heads/master@{#680615}
parent ba9e6f1c
......@@ -14,12 +14,10 @@
<structures>
<structure name="IDR_OS_SETTINGS_A11Y_PAGE_JS"
file="chromeos/os_a11y_page/os_a11y_page.js"
preprocess="true"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_A11Y_PAGE_HTML"
file="chromeos/os_a11y_page/os_a11y_page.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_MANAGE_A11Y_PAGE_JS"
file="a11y_page/manage_a11y_page.js"
......@@ -132,25 +130,20 @@
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_PERSONALIZATION_BROWSER_PROXY_JS"
file="chromeos/personalization_page/personalization_browser_proxy.js"
type="chrome_html"
preprocess="true" />
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_HTML"
file="chromeos/personalization_page/personalization_page.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_PERSONALIZATION_PAGE_JS"
file="chromeos/personalization_page/personalization_page.js"
type="chrome_html"
preprocess="true" />
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_OS_SETTINGS_PAGE_JS"
file="chromeos/os_settings_page/os_settings_page.js"
preprocess="true"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_OS_SETTINGS_PAGE_HTML"
file="chromeos/os_settings_page/os_settings_page.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_EDIT_EXCEPTION_DIALOG_HTML"
file="site_settings/edit_exception_dialog.html"
......@@ -177,7 +170,6 @@
<structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MAIN_HTML"
file="chromeos/os_settings_main/os_settings_main.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MAIN_JS"
file="chromeos/os_settings_main/os_settings_main.js"
......@@ -185,7 +177,6 @@
<structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MENU_HTML"
file="chromeos/os_settings_menu/os_settings_menu.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_MENU_JS"
file="chromeos/os_settings_menu/os_settings_menu.js"
......@@ -226,12 +217,10 @@
<structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_UI_HTML"
file="chromeos/os_settings_ui/os_settings_ui.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_CR_OS_SETTINGS_UI_JS"
file="chromeos/os_settings_ui/os_settings_ui.js"
type="chrome_html"
preprocess="true" />
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_HTML"
file="global_scroll_target_behavior.html"
type="chrome_html" />
......@@ -450,12 +439,10 @@
<structure name="IDR_OS_SETTINGS_FILES_PAGE_HTML"
file="chromeos/os_files_page/os_files_page.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_FILES_PAGE_JS"
file="chromeos/os_files_page/os_files_page.js"
type="chrome_html"
preprocess="true" />
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_SMB_SHARES_PAGE_HTML"
file="chromeos/os_files_page/smb_shares_page.html"
type="chrome_html" />
......@@ -477,8 +464,7 @@
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_RESET_PAGE_HTML"
file="chromeos/os_reset_page/os_reset_page.html"
type="chrome_html"
preprocess="true" />
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_RESET_PAGE_JS"
file="chromeos/os_reset_page/os_reset_page.js"
type="chrome_html" />
......@@ -512,12 +498,10 @@
<structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_HTML"
file="chromeos/os_languages_page/os_languages_page.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_LANGUAGES_PAGE_JS"
file="chromeos/os_languages_page/os_languages_page.js"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_LANGUAGES_SECTION_HTML"
file="chromeos/os_languages_page/os_languages_section.html"
......@@ -547,7 +531,6 @@
<structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_JS"
file="chromeos/os_people_page/os_people_page.js"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_PEOPLE_PAGE_SIGNOUT_DIALOG_HTML"
file="people_page/signout_dialog.html"
......@@ -597,12 +580,10 @@
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_PRINTING_PAGE_HTML"
file="chromeos/os_printing_page/os_printing_page.html"
preprocess="true"
allowexternalscript="true"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_PRINTING_PAGE_JS"
file="chromeos/os_printing_page/os_printing_page.js"
preprocess="true"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_CUPS_PRINTER_TYPES_HTML"
file="printing_page/cups_printer_types.html"
......@@ -742,10 +723,10 @@
file="chromeos/os_privacy_page/os_privacy_page.html"
type="chrome_html"
flattenhtml="true"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_OS_PRIVACY_PAGE_JS"
file="chromeos/os_privacy_page/os_privacy_page.js"
preprocess="true"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_PROTOCOL_HANDLERS_HTML"
file="site_settings/protocol_handlers.html"
......@@ -914,12 +895,10 @@
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_SEARCH_PAGE_JS"
file="chromeos/os_search_page/os_search_page.js"
type="chrome_html"
preprocess="true" />
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_SEARCH_PAGE_HTML"
file="chromeos/os_search_page/os_search_page.html"
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_SYNC_CONTROLS_JS"
file="people_page/sync_controls.js"
......@@ -930,7 +909,7 @@
type="chrome_html"
preprocess="true"
allowexternalscript="true" />
<structure name="IDR_OS_SETTINGS_SYNC_PAGE_JS"
<structure name="IDR_OS_SETTINGS_SYNC_PAGE_JS"
file="people_page/sync_page.js"
type="chrome_html"
preprocess="true" />
......@@ -953,11 +932,10 @@
file="system_page/system_page.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_SETTINGS_HTML"
preprocess="true"
file="chromeos/os_settings.html"
preprocess="true"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_LAZY_LOAD_HTML"
preprocess="true"
file="chromeos/lazy_load.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment