chrome/browser/resources/options_resources.grd - Issue 2626283005: Fix polymer import issue in options after changes in lock_screen.html

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2626283005: Fix polymer import issue in options after changes in lock_screen.html (Closed)

Patch Set: rebase Created 3 years, 11 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/chromeos/quick_unlock_configure_overlay.js ('k') | chrome/browser/ui/webui/options/options_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 34381cfa7cd52f6554244f3931efdbb8910c058e..ae79ee13d94a1f55f65d269d1898f1b5e0d526ad 100644

--- a/chrome/browser/resources/options_resources.grd

+++ b/chrome/browser/resources/options_resources.grd

@@ -86,6 +86,33 @@

type="chrome_html"

flattenhtml="true"

allowexternalscript="true" />

+ <structure name="IDR_SETTINGS_TOGGLE_BUTTON_HTML"

+ file="settings/controls/settings_toggle_button.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"

+ flattenhtml="true" />

+ <structure name="IDR_SETTINGS_BOOLEAN_CONTROL_BEHAVIOR_HTML"

+ file="settings/controls/settings_boolean_control_behavior.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"

+ flattenhtml="true" />

+ <structure name="IDR_SETTINGS_PREF_CONTROL_BEHAVIOR_HTML"

+ file="settings/controls/pref_control_behavior.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"

+ flattenhtml="true" />

<structure name="IDR_SETTINGS_VARS_CSS_HTML"

file="settings/settings_vars_css.html"

type="chrome_html"