chrome/browser/resources/settings/settings_resources.grd - Issue 2677003004: MD Settings: Make Protected Content setting available to all platforms.

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

Issue 2677003004: MD Settings: Make Protected Content setting available to all platforms. (Closed)

Patch Set: Merge branch 'master' of https://chromium.googlesource.com/chromium/src into 399-settings-make-enab… 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:

View unified diff | Download patch

« no previous file with comments | « 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 832 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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 preprocess="true" />	847 preprocess="true" />

848 <structure name="IDR_SETTINGS_CONSTANTS_HTML"	848 <structure name="IDR_SETTINGS_CONSTANTS_HTML"

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

850 type="chrome_html" />	850 type="chrome_html" />

851 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML"	851 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_HTML"

852 file="site_settings_page/site_settings_page.html"	852 file="site_settings_page/site_settings_page.html"

853 type="chrome_html"	853 type="chrome_html" />

854 preprocess="true" />

855 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_JS"	854 <structure name="IDR_SETTINGS_SITE_SETTINGS_PAGE_JS"

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

857 type="chrome_html" />	856 type="chrome_html" />

858 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_HTML"	857 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_HTML"

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

860 type="chrome_html" />	859 type="chrome_html" />

861 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS"	860 <structure name="IDR_SETTINGS_SITE_SETTINGS_PREFS_BROWSER_PROXY_JS"

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

863 type="chrome_html" />	862 type="chrome_html" />

864 <structure name="IDR_SETTINGS_SITE_DETAILS_HTML"	863 <structure name="IDR_SETTINGS_SITE_DETAILS_HTML"

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

1221 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1220 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

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

1223 type="chrome_html"	1222 type="chrome_html"

1224 preprocess="true"	1223 preprocess="true"

1225 allowexternalscript="true" />	1224 allowexternalscript="true" />

1226 </if>	1225 </if>

1227 </structures>	1226 </structures>

1228 </release>	1227 </release>

1229 </grit>	1228 </grit>

OLD	NEW