chrome/browser/resources/settings/settings_resources.grd - Issue 2210933004: Settings Router Refactor: Kill settings-router.

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

Issue 2210933004: Settings Router Refactor: Kill settings-router. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix merge Created 4 years, 4 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_section.js ('k') | chrome/browser/resources/settings/settings_ui/settings_ui.html » ('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" 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 721 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
732 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_JS"	732 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_JS"

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

734 type="chrome_html" />	734 type="chrome_html" />

735 <structure name="IDR_SETTINGS_ROUTE_HTML"	735 <structure name="IDR_SETTINGS_ROUTE_HTML"

736 file="route.html"	736 file="route.html"

737 type="chrome_html" />	737 type="chrome_html" />

738 <structure name="IDR_SETTINGS_ROUTE_JS"	738 <structure name="IDR_SETTINGS_ROUTE_JS"

739 file="route.js"	739 file="route.js"

740 type="chrome_html"	740 type="chrome_html"

741 preprocess="true" />	741 preprocess="true" />

742 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_HTML"

743 file="settings_page/settings_router.html"

744 type="chrome_html" />

745 <structure name="IDR_SETTINGS_CR_SETTINGS_ROUTER_JS"

746 file="settings_page/settings_router.js"

747 type="chrome_html"

748 flattenhtml="true"

749 allowexternalscript="true" />

750 <structure name="IDR_SETTINGS_SITE_DATA_HTML"	742 <structure name="IDR_SETTINGS_SITE_DATA_HTML"

751 file="site_settings/site_data.html"	743 file="site_settings/site_data.html"

752 type="chrome_html" />	744 type="chrome_html" />

753 <structure name="IDR_SETTINGS_SITE_DATA_JS"	745 <structure name="IDR_SETTINGS_SITE_DATA_JS"

754 file="site_settings/site_data.js"	746 file="site_settings/site_data.js"

755 type="chrome_html" />	747 type="chrome_html" />

756 <structure name="IDR_SETTINGS_SITE_DATA_DETAILS_DIALOG_HTML"	748 <structure name="IDR_SETTINGS_SITE_DATA_DETAILS_DIALOG_HTML"

757 file="site_settings/site_data_details_dialog.html"	749 file="site_settings/site_data_details_dialog.html"

758 type="chrome_html" />	750 type="chrome_html" />

759 <structure name="IDR_SETTINGS_SITE_DATA_DETAILS_DIALOG_JS"	751 <structure name="IDR_SETTINGS_SITE_DATA_DETAILS_DIALOG_JS"

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

1110 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1102 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1111 file="people_page/users_page.html"	1103 file="people_page/users_page.html"

1112 type="chrome_html"	1104 type="chrome_html"

1113 flattenhtml="true"	1105 flattenhtml="true"

1114 allowexternalscript="true" />	1106 allowexternalscript="true" />

1115 </if>	1107 </if>

1116 </structures>	1108 </structures>

1117 </release>	1109 </release>

1118 </grit>	1110 </grit>

OLD	NEW