chrome/browser/resources/settings/settings_resources.grd - Issue 2237823003: Site Settings Desktop: Implement USB devices section.

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

Issue 2237823003: Site Settings Desktop: Implement USB devices section. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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/route.js ('k') | chrome/browser/resources/settings/settings_shared_css.html » ('j') | chrome/browser/resources/settings/settings_shared_css.html » ('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 869 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
880 type="chrome_html" />	880 type="chrome_html" />

881 <structure name="IDR_SETTINGS_SYSTEM_PAGE_JS"	881 <structure name="IDR_SETTINGS_SYSTEM_PAGE_JS"

882 file="system_page/system_page.js"	882 file="system_page/system_page.js"

883 type="chrome_html" />	883 type="chrome_html" />

884 <structure name="IDR_SETTINGS_SETTINGS_HTML"	884 <structure name="IDR_SETTINGS_SETTINGS_HTML"

885 file="settings.html"	885 file="settings.html"

886 type="chrome_html" />	886 type="chrome_html" />

887 <structure name="IDR_SETTINGS_SETTINGS_JS"	887 <structure name="IDR_SETTINGS_SETTINGS_JS"

888 file="settings.js"	888 file="settings.js"

889 type="chrome_html" />	889 type="chrome_html" />

	890 <structure name="IDR_SETTINGS_USB_DEVICES_HTML"

	891 file="site_settings/usb_devices.html"

	892 type="chrome_html" />

	893 <structure name="IDR_SETTINGS_USB_DEVICES_JS"

	894 file="site_settings/usb_devices.js"

	895 type="chrome_html" />
	dschuyler 2016/08/11 23:28:07 nit: the indent is off here. nit: the indent is off here. Finnur 2016/08/12 13:11:25 Done. Show quoted text On 2016/08/11 23:28:07, dschuyler wrote: > nit: the indent is off here. Done.
890 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML"	896 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML"

891 file="site_settings/website_usage_private_api.html"	897 file="site_settings/website_usage_private_api.html"

892 type="chrome_html" />	898 type="chrome_html" />

893 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS"	899 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS"

894 file="site_settings/website_usage_private_api.js"	900 file="site_settings/website_usage_private_api.js"

895 type="chrome_html" />	901 type="chrome_html" />

896 <if expr="chromeos">	902 <if expr="chromeos">

897 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"	903 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"

898 file="bluetooth_page/bluetooth_device_dialog.html"	904 file="bluetooth_page/bluetooth_device_dialog.html"

899 type="chrome_html" />	905 type="chrome_html" />

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

1102 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1108 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

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

1104 type="chrome_html"	1110 type="chrome_html"

1105 flattenhtml="true"	1111 flattenhtml="true"

1106 allowexternalscript="true" />	1112 allowexternalscript="true" />

1107 </if>	1113 </if>

1108 </structures>	1114 </structures>

1109 </release>	1115 </release>

1110 </grit>	1116 </grit>

OLD	NEW