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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2855253003: MD Settings: Eliminate SettingsSubpageBrowsertest. (Closed)
Patch Set: Resolve conflicts. Created 3 years, 7 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
« no previous file with comments | « chrome/browser/resources/settings/settings_page/settings_page_visibility.js ('k') | chrome/test/data/webui/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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" output_all_resource_defines= "false"> 2 <grit latest_public_release="0" current_release="1" output_all_resource_defines= "false">
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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 file="settings_main/settings_main.js" 222 file="settings_main/settings_main.js"
223 type="chrome_html" /> 223 type="chrome_html" />
224 <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_HTML" 224 <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_HTML"
225 file="settings_menu/settings_menu.html" 225 file="settings_menu/settings_menu.html"
226 type="chrome_html" 226 type="chrome_html"
227 preprocess="true" 227 preprocess="true"
228 allowexternalscript="true" /> 228 allowexternalscript="true" />
229 <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_JS" 229 <structure name="IDR_SETTINGS_CR_SETTINGS_MENU_JS"
230 file="settings_menu/settings_menu.js" 230 file="settings_menu/settings_menu.js"
231 type="chrome_html" /> 231 type="chrome_html" />
232 <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_VISIBILITY_HTML"
233 file="settings_page/settings_page_visibility.html"
234 type="chrome_html" />
235 <structure name="IDR_SETTINGS_CR_SETTINGS_PAGE_VISIBILITY_JS"
236 file="settings_page/settings_page_visibility.js"
237 type="chrome_html" />
238 <structure name="IDR_SETTINGS_CR_SETTINGS_SECTION_HTML" 232 <structure name="IDR_SETTINGS_CR_SETTINGS_SECTION_HTML"
239 file="settings_page/settings_section.html" 233 file="settings_page/settings_section.html"
240 type="chrome_html" /> 234 type="chrome_html" />
241 <structure name="IDR_SETTINGS_CR_SETTINGS_SECTION_JS" 235 <structure name="IDR_SETTINGS_CR_SETTINGS_SECTION_JS"
242 file="settings_page/settings_section.js" 236 file="settings_page/settings_section.js"
243 type="chrome_html" /> 237 type="chrome_html" />
244 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_HTML" 238 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_HTML"
245 file="settings_page/settings_subpage.html" 239 file="settings_page/settings_subpage.html"
246 type="chrome_html" /> 240 type="chrome_html" />
247 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_JS" 241 <structure name="IDR_SETTINGS_CR_SETTINGS_SUBPAGE_JS"
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 type="chrome_html" /> 1312 type="chrome_html" />
1319 <structure name="IDR_SETTINGS_USERS_PAGE_HTML" 1313 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"
1320 file="people_page/users_page.html" 1314 file="people_page/users_page.html"
1321 type="chrome_html" 1315 type="chrome_html"
1322 preprocess="true" 1316 preprocess="true"
1323 allowexternalscript="true" /> 1317 allowexternalscript="true" />
1324 </if> 1318 </if>
1325 </structures> 1319 </structures>
1326 </release> 1320 </release>
1327 </grit> 1321 </grit>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/settings_page/settings_page_visibility.js ('k') | chrome/test/data/webui/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698