| Index: chrome/browser/resources/settings/settings_resources.grd
|
| diff --git a/chrome/browser/resources/settings/settings_resources.grd b/chrome/browser/resources/settings/settings_resources.grd
|
| index c4b5470792dc24bb4e3f7fcb134093fdb7deab0d..82d74437d9b13691e580fd708b122d773d7a1173 100644
|
| --- a/chrome/browser/resources/settings/settings_resources.grd
|
| +++ b/chrome/browser/resources/settings/settings_resources.grd
|
| @@ -14,12 +14,12 @@
|
| <structures>
|
| <structure name="IDR_SETTINGS_A11Y_PAGE_JS"
|
| file="a11y_page/a11y_page.js"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| type="chrome_html" />
|
| <structure name="IDR_SETTINGS_A11Y_PAGE_HTML"
|
| file="a11y_page/a11y_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <if expr="chromeos">
|
| <structure name="IDR_SETTINGS_MANAGE_A11Y_PAGE_JS"
|
| @@ -35,15 +35,15 @@
|
| <structure name="IDR_SETTINGS_ABOUT_PAGE_BROWSER_PROXY_JS"
|
| file="about_page/about_page_browser_proxy.js"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_ABOUT_PAGE_JS"
|
| file="about_page/about_page.js"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_ABOUT_PAGE_HTML"
|
| file="about_page/about_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <if expr="chromeos">
|
| <structure name="IDR_SETTINGS_CHANNEL_SWITCHER_DIALOG_HTML"
|
| @@ -108,7 +108,7 @@
|
| <structure name="IDR_SETTINGS_APPEARANCE_BROWSER_PROXY_JS"
|
| file="appearance_page/appearance_browser_proxy.js"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_APPEARANCE_FONTS_PAGE_HTML"
|
| file="appearance_page/appearance_fonts_page.html"
|
| type="chrome_html"
|
| @@ -119,20 +119,20 @@
|
| <structure name="IDR_SETTINGS_APPEARANCE_PAGE_HTML"
|
| file="appearance_page/appearance_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_APPEARANCE_PAGE_JS"
|
| file="appearance_page/appearance_page.js"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_BASIC_PAGE_JS"
|
| file="basic_page/basic_page.js"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| type="chrome_html" />
|
| <structure name="IDR_SETTINGS_BASIC_PAGE_HTML"
|
| file="basic_page/basic_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_EXTENSION_CONTROL_BROWSER_PROXY_JS"
|
| file="extension_control_browser_proxy.js"
|
| @@ -152,7 +152,7 @@
|
| <structure name="IDR_SETTINGS_LIFETIME_BROWSER_PROXY_JS"
|
| file="lifetime_browser_proxy.js"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_ON_STARTUP_BROWSER_PROXY_HTML"
|
| file="on_startup_page/on_startup_browser_proxy.html"
|
| type="chrome_html" />
|
| @@ -197,7 +197,7 @@
|
| <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_HTML"
|
| file="settings_main/settings_main.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_CR_SETTINGS_MAIN_JS"
|
| file="settings_main/settings_main.js"
|
| @@ -205,7 +205,7 @@
|
| <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_HTML"
|
| file="settings_menu/settings_menu.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_JS"
|
| file="settings_menu/settings_menu.js"
|
| @@ -249,16 +249,16 @@
|
| <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"
|
| file="settings_shared_css.html"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"
|
| file="settings_ui/settings_ui.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"
|
| file="settings_ui/settings_ui.js"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_HTML"
|
| file="global_scroll_target_behavior.html"
|
| type="chrome_html" />
|
| @@ -427,7 +427,7 @@
|
| <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_HTML"
|
| file="default_browser_page/default_browser_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_JS"
|
| file="default_browser_page/default_browser_page.js"
|
| @@ -516,7 +516,7 @@
|
| <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_HTML"
|
| file="downloads_page/downloads_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_JS"
|
| file="downloads_page/downloads_page.js"
|
| @@ -557,7 +557,7 @@
|
| type="chrome_html"/>
|
| <structure name="IDR_SETTINGS_RESET_BROWSER_PROXY_JS"
|
| file="reset_page/reset_browser_proxy.js"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| type="chrome_html" />
|
| <structure name="IDR_SETTINGS_RESET_BROWSER_PROXY_HTML"
|
| file="reset_page/reset_browser_proxy.html"
|
| @@ -568,7 +568,7 @@
|
| <structure name="IDR_SETTINGS_LANGUAGES_JS"
|
| file="languages_page/languages.js"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_LANGUAGES_ADD_LANGUAGES_DIALOG_HTML"
|
| file="languages_page/add_languages_dialog.html"
|
| @@ -579,12 +579,12 @@
|
| <structure name="IDR_SETTINGS_LANGUAGES_PAGE_HTML"
|
| file="languages_page/languages_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_LANGUAGES_PAGE_JS"
|
| file="languages_page/languages_page.js"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <if expr="chromeos">
|
| <structure name="IDR_SETTINGS_LANGUAGES_MANAGE_INPUT_METHODS_PAGE_HTML"
|
| @@ -655,7 +655,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_JS"
|
| file="people_page/people_page.js"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <if expr="not chromeos">
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_IMPORT_DATA_DIALOG_HTML"
|
| @@ -673,7 +673,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_HTML"
|
| file="people_page/manage_profile.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_MANAGE_PROFILE_JS"
|
| file="people_page/manage_profile.js"
|
| @@ -697,7 +697,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_SYNC_BROWSER_PROXY_JS"
|
| file="people_page/sync_browser_proxy.js"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PREF_UTIL_HTML"
|
| file="prefs/pref_util.html"
|
| @@ -725,12 +725,12 @@
|
| type="chrome_html" />
|
| <structure name="IDR_SETTINGS_PRINTING_PAGE_HTML"
|
| file="printing_page/printing_page.html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true"
|
| type="chrome_html" />
|
| <structure name="IDR_SETTINGS_PRINTING_PAGE_JS"
|
| file="printing_page/printing_page.js"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| type="chrome_html" />
|
| <if expr="chromeos">
|
| <structure name="IDR_SETTINGS_CUPS_PRINTING_PAGE_HTML"
|
| @@ -789,7 +789,7 @@
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"
|
| file="privacy_page/privacy_page.js"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| type="chrome_html" />
|
| <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"
|
| file="privacy_page/privacy_page_browser_proxy.html"
|
| @@ -877,7 +877,7 @@
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_DIALOG_HTML"
|
| file="search_engines_page/search_engine_dialog.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_JS"
|
| file="search_engines_page/search_engine_entry.js"
|
| @@ -885,7 +885,7 @@
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_HTML"
|
| file="search_engines_page/search_engine_entry.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINE_ENTRY_CSS_HTML"
|
| file="search_engines_page/search_engine_entry_css.html"
|
| @@ -896,7 +896,7 @@
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_OMNIBOX_EXTENSION_ENTRY_HTML"
|
| file="search_engines_page/omnibox_extension_entry.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_LIST_JS"
|
| file="search_engines_page/search_engines_list.js"
|
| @@ -904,7 +904,7 @@
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_LIST_HTML"
|
| file="search_engines_page/search_engines_list.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_PAGE_JS"
|
| file="search_engines_page/search_engines_page.js"
|
| @@ -912,17 +912,17 @@
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_PAGE_SEARCH_ENGINES_PAGE_HTML"
|
| file="search_engines_page/search_engines_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_JS"
|
| file="search_engines_page/search_engines_browser_proxy.js"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SEARCH_ENGINES_BROWSER_PROXY_HTML"
|
| file="search_engines_page/search_engines_browser_proxy.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SEARCH_PAGE_JS"
|
| file="search_page/search_page.js"
|
| @@ -930,7 +930,7 @@
|
| <structure name="IDR_SETTINGS_SEARCH_PAGE_HTML"
|
| file="search_page/search_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SYNC_PAGE_JS"
|
| file="people_page/sync_page.js"
|
| @@ -938,7 +938,7 @@
|
| <structure name="IDR_SETTINGS_SYNC_PAGE_HTML"
|
| file="people_page/sync_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_SYSTEM_PAGE_BROWSER_PROXY_HTML"
|
| file="system_page/system_page_browser_proxy.html"
|
| @@ -984,12 +984,12 @@
|
| <structure name="IDR_SETTINGS_ANDROID_APPS_BROWSER_PROXY_JS"
|
| file="android_apps_page/android_apps_browser_proxy.js"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_ANDROID_APPS_BROWSER_PROXY_HTML"
|
| file="android_apps_page/android_apps_browser_proxy.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"
|
| file="bluetooth_page/bluetooth_device_dialog.html"
|
| @@ -1099,7 +1099,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_CAMERA_HTML"
|
| file="people_page/camera.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_CAMERA_JS"
|
| file="people_page/camera.js"
|
| @@ -1107,7 +1107,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_HTML"
|
| file="people_page/change_picture.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_PAGE_CHANGE_PICTURE_JS"
|
| file="people_page/change_picture.js"
|
| @@ -1118,7 +1118,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_CHANGE_PICTURE_BROWSER_PROXY_HTML"
|
| file="people_page/change_picture_browser_proxy.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_BROWSER_PROXY_JS"
|
| file="people_page/easy_unlock_browser_proxy.js"
|
| @@ -1126,7 +1126,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_BROWSER_PROXY_HTML"
|
| file="people_page/easy_unlock_browser_proxy.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_JS"
|
| file="people_page/easy_unlock_turn_off_dialog.js"
|
| @@ -1134,7 +1134,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_EASY_UNLOCK_TURN_OFF_DIALOG_HTML"
|
| file="people_page/easy_unlock_turn_off_dialog.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_JS"
|
| file="people_page/password_prompt_dialog.js"
|
| @@ -1142,12 +1142,12 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_PASSWORD_PROMPT_DIALOG_HTML"
|
| file="people_page/password_prompt_dialog.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_PIN_KEYBOARD_HTML"
|
| file="people_page/pin_keyboard.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true"/>
|
| <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_JS"
|
| file="people_page/lock_screen.js"
|
| @@ -1155,7 +1155,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_HTML"
|
| file="people_page/lock_screen.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_CONSTANTS_JS"
|
| file="people_page/lock_screen_constants.js"
|
| @@ -1163,7 +1163,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_LOCK_SCREEN_CONSTANTS_HTML"
|
| file="people_page/lock_screen_constants.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_JS"
|
| file="people_page/lock_state_behavior.js"
|
| @@ -1171,7 +1171,7 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_LOCK_STATE_BEHAVIOR_HTML"
|
| file="people_page/lock_state_behavior.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_JS"
|
| file="people_page/setup_pin_dialog.js"
|
| @@ -1179,19 +1179,19 @@
|
| <structure name="IDR_SETTINGS_PEOPLE_SETUP_PIN_DIALOG_HTML"
|
| file="people_page/setup_pin_dialog.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_KEYBOARD_PIN_JS"
|
| file="people_page/pin_keyboard.js"
|
| type="chrome_html"
|
| - flattenhtml="true" />
|
| + preprocess="true" />
|
| <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_JS"
|
| file="people_page/users_add_user_dialog.js"
|
| type="chrome_html" />
|
| <structure name="IDR_SETTINGS_USERS_PAGE_ADD_USER_DIALOG_HTML"
|
| file="people_page/users_add_user_dialog.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_JS"
|
| file="people_page/user_list.js"
|
| @@ -1199,7 +1199,7 @@
|
| <structure name="IDR_SETTINGS_USERS_PAGE_USER_LIST_HTML"
|
| file="people_page/user_list.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| <structure name="IDR_SETTINGS_USERS_PAGE_JS"
|
| file="people_page/users_page.js"
|
| @@ -1207,7 +1207,7 @@
|
| <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
|
| file="people_page/users_page.html"
|
| type="chrome_html"
|
| - flattenhtml="true"
|
| + preprocess="true"
|
| allowexternalscript="true" />
|
| </if>
|
| </structures>
|
|
|