chrome/browser/resources/settings/settings_resources.grd - Issue 1758973002: MD Settings: Creating a <settings-dialog> element.

Side by Side Diff: chrome/browser/resources/settings/settings_resources.grd

Issue 1758973002: MD Settings: Creating a <settings-dialog> element. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Resolve conflicts. Created 4 years, 9 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 unified diff | Download patch

« chrome/browser/resources/settings/settings_dialog.html ('K') | « chrome/browser/resources/settings/settings_dialog_css.html ('k') | chrome/test/data/webui/settings/reset_page_test.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <?xml version="1.0" encoding="UTF-8"?>	1 <?xml version="1.0" encoding="UTF-8"?>

2 <grit latest_public_release="0" current_release="1">	2 <grit latest_public_release="0" current_release="1">

3 <outputs>	3 <outputs>

4 <output filename="grit/settings_resources.h" type="rc_header">	4 <output filename="grit/settings_resources.h" type="rc_header">

5 <emit emit_type='prepend'></emit>	5 <emit emit_type='prepend'></emit>

6 </output>	6 </output>

7 <output filename="grit/settings_resources_map.cc"	7 <output filename="grit/settings_resources_map.cc"

8 type="resource_file_map_source" />	8 type="resource_file_map_source" />

9 <output filename="grit/settings_resources_map.h"	9 <output filename="grit/settings_resources_map.h"

10 type="resource_map_header" />	10 type="resource_map_header" />

(...skipping 115 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
126 type="chrome_html" />	126 type="chrome_html" />

127 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_HTML"	127 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_HTML"

128 file="settings_page/settings_subheader.html"	128 file="settings_page/settings_subheader.html"

129 type="chrome_html" />	129 type="chrome_html" />

130 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_JS"	130 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBHEADER_JS"

131 file="settings_page/settings_subheader.js"	131 file="settings_page/settings_subheader.js"

132 type="chrome_html" />	132 type="chrome_html" />

133 <structure name="IDR_SETTINGS_CR_SETTINGS_DIALOG_CSS_HTML"	133 <structure name="IDR_SETTINGS_CR_SETTINGS_DIALOG_CSS_HTML"

134 file="settings_dialog_css.html"	134 file="settings_dialog_css.html"

135 type="chrome_html" />	135 type="chrome_html" />

	136 <structure name="IDR_SETTINGS_CR_SETTINGS_DIALOG_HTML"

	137 file="settings_dialog.html"

	138 type="chrome_html" />

	139 <structure name="IDR_SETTINGS_CR_SETTINGS_DIALOG_JS"

	140 file="settings_dialog.js"

	141 type="chrome_html" />

136 <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS"	142 <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_CSS"

137 file="settings_page.css"	143 file="settings_page.css"

138 type="chrome_html" />	144 type="chrome_html" />

139 <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"	145 <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"

140 file="settings_shared_css.html"	146 file="settings_shared_css.html"

141 type="chrome_html" />	147 type="chrome_html" />

142 <structure name="IDR_SETTINGS_BREADCRUMB_CSS"	148 <structure name="IDR_SETTINGS_BREADCRUMB_CSS"

143 file="settings_ui/breadcrumb.css"	149 file="settings_ui/breadcrumb.css"

144 type="chrome_html" />	150 type="chrome_html" />

145 <structure name="IDR_SETTINGS_BREADCRUMB_HTML"	151 <structure name="IDR_SETTINGS_BREADCRUMB_HTML"

(...skipping 665 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
811 type="chrome_html"	817 type="chrome_html"

812 flattenhtml="true"	818 flattenhtml="true"

813 allowexternalscript="true" />	819 allowexternalscript="true" />

814 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	820 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

815 file="people_page/users_page.css"	821 file="people_page/users_page.css"

816 type="chrome_html" />	822 type="chrome_html" />

817 </if>	823 </if>

818 </structures>	824 </structures>

819 </release>	825 </release>

820 </grit>	826 </grit>

OLD	NEW