chrome/browser/resources/settings/settings_resources.grd - Issue 2673783002: MD Settings: Add Protected Content toggle to Site Settings

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

Issue 2673783002: MD Settings: Add Protected Content toggle to Site Settings (Closed)

Patch Set: add no-search Created 3 years, 10 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:

« chrome/browser/resources/settings/privacy_page/privacy_page.html ('K') | « chrome/browser/resources/settings/route.js ('k') | chrome/browser/resources/settings/site_settings_page/site_settings_page.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 831 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
842 file="site_settings/site_settings_behavior.js"	842 file="site_settings/site_settings_behavior.js"

843 type="chrome_html" />	843 type="chrome_html" />

844 <structure name="IDR_SETTINGS_CONSTANTS_JS"	844 <structure name="IDR_SETTINGS_CONSTANTS_JS"

845 file="site_settings/constants.js"	845 file="site_settings/constants.js"

846 type="chrome_html" />	846 type="chrome_html" />

847 <structure name="IDR_SETTINGS_CONSTANTS_HTML"	847 <structure name="IDR_SETTINGS_CONSTANTS_HTML"

848 file="site_settings/constants.html"	848 file="site_settings/constants.html"

849 type="chrome_html" />	849 type="chrome_html" />

850 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML"	850 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML"

851 file="site_settings_page/site_settings_page.html"	851 file="site_settings_page/site_settings_page.html"

852 type="chrome_html" />	852 type="chrome_html"

	853 preprocess="true"

	854 allowexternalscript="true" />
	dpapad 2017/02/03 22:20:14 Is the allowexternscript needed? Is the allowexternscript needed? tommycli 2017/02/03 22:50:51 Done. Show quoted text On 2017/02/03 22:20:14, dpapad wrote: > Is the allowexternscript needed? Done.
853 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_JS"	855 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_JS"

854 file="site_settings_page/site_settings_page.js"	856 file="site_settings_page/site_settings_page.js"

855 type="chrome_html" />	857 type="chrome_html" />

856 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_HTML"	858 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_HTML"

857 file="site_settings/site_settings_prefs_browser_proxy.html"	859 file="site_settings/site_settings_prefs_browser_proxy.html"

858 type="chrome_html" />	860 type="chrome_html" />

859 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS"	861 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS"

860 file="site_settings/site_settings_prefs_browser_proxy.js"	862 file="site_settings/site_settings_prefs_browser_proxy.js"

861 type="chrome_html" />	863 type="chrome_html" />

862 <structure name="IDR_SETTINGS_SITE_DETAILS_HTML"	864 <structure name="IDR_SETTINGS_SITE_DETAILS_HTML"

(...skipping 355 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1218 type="chrome_html" />	1220 type="chrome_html" />

1219 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1221 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1220 file="people_page/users_page.html"	1222 file="people_page/users_page.html"

1221 type="chrome_html"	1223 type="chrome_html"

1222 preprocess="true"	1224 preprocess="true"

1223 allowexternalscript="true" />	1225 allowexternalscript="true" />

1224 </if>	1226 </if>

1225 </structures>	1227 </structures>

1226 </release>	1228 </release>

1227 </grit>	1229 </grit>

OLD	NEW