Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/options_resources.grd

Issue 2728563003: Revert of fix quick unlock config in options (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/settings/people_page/lock_screen.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options_resources.grd
diff --git a/chrome/browser/resources/options_resources.grd b/chrome/browser/resources/options_resources.grd
index b6d776f8ac324d527bcf54965a302211a1182d51..71abcdaee0f01766ef65e60aeb06b31a756042b5 100644
--- a/chrome/browser/resources/options_resources.grd
+++ b/chrome/browser/resources/options_resources.grd
@@ -21,39 +21,49 @@
<structure name="IDR_OPTIONS_ICONS_HTML"
file="settings/icons.html"
type="chrome_html"
- preprocess="true" />
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_PIN_KEYBOARD_HTML"
file="chromeos/quick_unlock/pin_keyboard.html"
type="chrome_html"
- preprocess="true" />
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_PIN_KEYBOARD_JS"
file="chromeos/quick_unlock/pin_keyboard.js"
type="chrome_html"
- preprocess="true" />
+ flattenhtml="true" />
<structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_JS"
file="settings/people_page/password_prompt_dialog.js"
type="chrome_html" />
<structure name="IDR_OPTIONS_PASSWORD_PROMPT_DIALOG_HTML"
file="settings/people_page/password_prompt_dialog.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_JS"
file="settings/people_page/lock_screen_constants.js"
type="chrome_html" />
<structure name="IDR_OPTIONS_LOCK_SCREEN_CONSTANTS_HTML"
file="settings/people_page/lock_screen_constants.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_JS"
file="settings/people_page/lock_state_behavior.js"
type="chrome_html" />
<structure name="IDR_OPTIONS_LOCK_STATE_BEHAVIOR_HTML"
file="settings/people_page/lock_state_behavior.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_JS"
file="settings/people_page/setup_pin_dialog.js"
type="chrome_html" />
<structure name="IDR_OPTIONS_SETUP_PIN_DIALOG_HTML"
file="settings/people_page/setup_pin_dialog.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_FINGERPRINT_LIST_JS"
file="settings/people_page/fingerprint_list.js"
type="chrome_html" />
@@ -83,62 +93,78 @@
type="chrome_html" />
<structure name="IDR_OPTIONS_LOCK_SCREEN_HTML"
file="settings/people_page/lock_screen.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_ROUTE_HTML"
file="settings/route.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_OPTIONS_ROUTE_JS"
file="settings/route.js"
type="chrome_html"
- preprocess="true" />
+ flattenhtml="true" />
<structure name="IDR_SETTINGS_SHARED_CSS_HTML"
file="settings/settings_shared_css.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_SETTINGS_TOGGLE_BUTTON_HTML"
file="settings/controls/settings_toggle_button.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_SETTINGS_TOGGLE_BUTTON_JS"
file="settings/controls/settings_toggle_button.js"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true" />
<structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML"
file="settings/controls/settings_boolean_control_behavior.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_JS"
file="settings/controls/settings_boolean_control_behavior.js"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true" />
<structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML"
file="settings/controls/pref_control_behavior.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_JS"
file="settings/controls/pref_control_behavior.js"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true" />
<structure name="IDR_SETTINGS_VARS_CSS_HTML"
file="settings/settings_vars_css.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_SETTINGS_PREFS_BEHAVIOR_HTML"
file="settings/prefs/prefs_behavior.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_SETTINGS_PREFS_BEHAVIOR_JS"
file="settings/prefs/prefs_behavior.js"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true" />
<structure name="IDR_SETTINGS_PREFS_TYPES_HTML"
file="settings/prefs/prefs_types.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
<structure name="IDR_SETTINGS_PREFS_TYPES_JS"
file="settings/prefs/prefs_types.js"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_PREFS_HTML"
- file="settings/prefs/prefs.html"
- type="chrome_html" />
- <structure name="IDR_SETTINGS_PREFS_JS"
- file="settings/prefs/prefs.js"
- type="chrome_html" />
- <structure name="IDR_OPTIONS_I18N_SETUP_HTML"
- file="options/i18n_setup.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true" />
<structure name="IDR_OPTIONS_POLYMER_ELEMENTS_HTML"
file="options/options_polymer.html"
- type="chrome_html" />
+ type="chrome_html"
+ flattenhtml="true"
+ allowexternalscript="true" />
</if>
</structures>
</release>
« no previous file with comments | « chrome/browser/resources/options/options.html ('k') | chrome/browser/resources/settings/people_page/lock_screen.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698