chrome/browser/resources/settings/settings_resources.grd - Issue 2233443002: MD Settings: implement metrics reporting checkbox on desktop

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

Issue 2233443002: MD Settings: implement metrics reporting checkbox on desktop (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@desktop-uma

Patch Set: remove 2 using 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/privacy_page/privacy_page_browser_proxy.js ('k') | chrome/browser/ui/webui/settings/md_settings_ui.cc » ('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 694 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
705 type="chrome_html" />	705 type="chrome_html" />

706 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"	706 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"

707 file="privacy_page/privacy_page.html"	707 file="privacy_page/privacy_page.html"

708 type="chrome_html"	708 type="chrome_html"

709 flattenhtml="true"	709 flattenhtml="true"

710 allowexternalscript="true" />	710 allowexternalscript="true" />

711 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"	711 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"

712 file="privacy_page/privacy_page.js"	712 file="privacy_page/privacy_page.js"

713 flattenhtml="true"	713 flattenhtml="true"

714 type="chrome_html" />	714 type="chrome_html" />

715 <if expr="is_win or is_macosx">	715 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"

716 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_HTML"	716 file="privacy_page/privacy_page_browser_proxy.html"

717 file="privacy_page/privacy_page_browser_proxy.html"	717 type="chrome_html" />

718 type="chrome_html" />	718 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"

719 <structure name="IDR_SETTINGS_PRIVACY_PAGE_BROWSER_PROXY_JS"	719 file="privacy_page/privacy_page_browser_proxy.js"

720 file="privacy_page/privacy_page_browser_proxy.js"	720 preprocess="true"

721 type="chrome_html" />	721 type="chrome_html" />

722 </if>

723 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_HTML"	722 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_HTML"

724 file="site_settings/protocol_handlers.html"	723 file="site_settings/protocol_handlers.html"

725 type="chrome_html" />	724 type="chrome_html" />

726 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_JS"	725 <structure name="IDR_SETTINGS_PROTOCOL_HANDLERS_JS"

727 file="site_settings/protocol_handlers.js"	726 file="site_settings/protocol_handlers.js"

728 type="chrome_html" />	727 type="chrome_html" />

729 <structure name="IDR_SETTINGS_ROUTE_HTML"	728 <structure name="IDR_SETTINGS_ROUTE_HTML"

730 file="route.html"	729 file="route.html"

731 type="chrome_html" />	730 type="chrome_html" />

732 <structure name="IDR_SETTINGS_ROUTE_JS"	731 <structure name="IDR_SETTINGS_ROUTE_JS"

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

1096 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1095 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

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

1098 type="chrome_html"	1097 type="chrome_html"

1099 flattenhtml="true"	1098 flattenhtml="true"

1100 allowexternalscript="true" />	1099 allowexternalscript="true" />

1101 </if>	1100 </if>

1102 </structures>	1101 </structures>

1103 </release>	1102 </release>

1104 </grit>	1103 </grit>

OLD	NEW