chrome/browser/resources/settings/settings_resources.grd - Issue 2153113003: Settings Router Refactor: Migrate canonical route list to new-style.

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

Issue 2153113003: Settings Router Refactor: Migrate canonical route list to new-style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Make setting-router use new list. Delete old list. Created 4 years, 5 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_page/settings_router.js ('K') | « chrome/browser/resources/settings/settings_page/settings_router.js ('k') | chrome/test/data/webui/settings/cr_settings_browsertest.js » ('j') | chrome/test/data/webui/settings/route_tests.js » ('J')
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" 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 663 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
674 file="site_settings/protocol_handlers.html"	674 file="site_settings/protocol_handlers.html"

675 type="chrome_html" />	675 type="chrome_html" />

676 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_JS"	676 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_JS"

677 file="site_settings/protocol_handlers.js"	677 file="site_settings/protocol_handlers.js"

678 type="chrome_html" />	678 type="chrome_html" />

679 <structure name="IDR_SETTINGS_ROUTE_HTML"	679 <structure name="IDR_SETTINGS_ROUTE_HTML"

680 file="route.html"	680 file="route.html"

681 type="chrome_html" />	681 type="chrome_html" />

682 <structure name="IDR_SETTINGS_ROUTE_JS"	682 <structure name="IDR_SETTINGS_ROUTE_JS"

683 file="route.js"	683 file="route.js"

684 type="chrome_html" />	684 type="chrome_html"

	685 flattenhtml="true" />
	Dan Beam 2016/07/15 23:28:27 can you use preprocess="true" instead here? can you use preprocess="true" instead here? tommycli 2016/07/15 23:47:51 Done. Show quoted text On 2016/07/15 23:28:27, Dan Beam wrote: > can you use preprocess="true" instead here? Done.
685 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"	686 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"

686 file="settings_page/settings_router.html"	687 file="settings_page/settings_router.html"

687 type="chrome_html" />	688 type="chrome_html" />

688 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"	689 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"

689 file="settings_page/settings_router.js"	690 file="settings_page/settings_router.js"

690 type="chrome_html"	691 type="chrome_html"

691 flattenhtml="true"	692 flattenhtml="true"

692 allowexternalscript="true" />	693 allowexternalscript="true" />

693 <structure name="IDR_SETTINGS_SITE_DATA_HTML"	694 <structure name="IDR_SETTINGS_SITE_DATA_HTML"

694 file="site_settings/site_data.html"	695 file="site_settings/site_data.html"

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

1058 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1059 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1059 file="people_page/users_page.html"	1060 file="people_page/users_page.html"

1060 type="chrome_html"	1061 type="chrome_html"

1061 flattenhtml="true"	1062 flattenhtml="true"

1062 allowexternalscript="true" />	1063 allowexternalscript="true" />

1063 </if>	1064 </if>

1064 </structures>	1065 </structures>

1065 </release>	1066 </release>

1066 </grit>	1067 </grit>

OLD	NEW