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: One more fix 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/site_settings/compiled_resources2.gyp » ('j') | chrome/browser/ui/webui/options/content_settings_handler.cc » ('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 862 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
873 type="chrome_html" />	873 type="chrome_html" />

874 <structure name="IDR_SETTINGS_SYSTEM_PAGE_JS"	874 <structure name="IDR_SETTINGS_SYSTEM_PAGE_JS"

875 file="system_page/system_page.js"	875 file="system_page/system_page.js"

876 type="chrome_html" />	876 type="chrome_html" />

877 <structure name="IDR_SETTINGS_SETTINGS_HTML"	877 <structure name="IDR_SETTINGS_SETTINGS_HTML"

878 file="settings.html"	878 file="settings.html"

879 type="chrome_html" />	879 type="chrome_html" />

880 <structure name="IDR_SETTINGS_SETTINGS_JS"	880 <structure name="IDR_SETTINGS_SETTINGS_JS"

881 file="settings.js"	881 file="settings.js"

882 type="chrome_html" />	882 type="chrome_html" />

	883 <structure name="IDR_SETTINGS_USB_DEVICES_HTML"
	stevenjb 2016/08/15 19:01:54 Fix indent Fix indent Finnur 2016/08/16 10:13:55 Done. Show quoted text On 2016/08/15 19:01:54, stevenjb wrote: > Fix indent Done.
	884 file="site_settings/usb_devices.html"

	885 type="chrome_html" />

	886 <structure name="IDR_SETTINGS_USB_DEVICES_JS"

	887 file="site_settings/usb_devices.js"

	888 type="chrome_html" />

883 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML"	889 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_HTML"

884 file="site_settings/website_usage_private_api.html"	890 file="site_settings/website_usage_private_api.html"

885 type="chrome_html" />	891 type="chrome_html" />

886 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS"	892 <structure name="IDR_SETTINGS_WEBSITE_USAGE_PRIVATE_API_JS"

887 file="site_settings/website_usage_private_api.js"	893 file="site_settings/website_usage_private_api.js"

888 type="chrome_html" />	894 type="chrome_html" />

889 <if expr="chromeos">	895 <if expr="chromeos">

890 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"	896 <structure name="IDR_SETTINGS_BLUETOOTH_DEVICE_DIALOG_HTML"

891 file="bluetooth_page/bluetooth_device_dialog.html"	897 file="bluetooth_page/bluetooth_device_dialog.html"

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

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

1095 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1101 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1096 file="people_page/users_page.html"	1102 file="people_page/users_page.html"

1097 type="chrome_html"	1103 type="chrome_html"

1098 flattenhtml="true"	1104 flattenhtml="true"

1099 allowexternalscript="true" />	1105 allowexternalscript="true" />

1100 </if>	1106 </if>

1101 </structures>	1107 </structures>

1102 </release>	1108 </release>

1103 </grit>	1109 </grit>

OLD	NEW