chrome/browser/resources/settings/settings_resources.grd - Issue 1698093007: Convert SiteSettingsCategory to use the HostContentSettingsMap instead of

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

Issue 1698093007: Convert SiteSettingsCategory to use the HostContentSettingsMap instead of (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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 | « no previous file | chrome/browser/resources/settings/site_settings/compiled_resources.gyp » ('j') | chrome/browser/resources/settings/site_settings/prefs_private_api.js » ('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">	2 <grit latest_public_release="0" current_release="1">

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 368 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
379 type="chrome_html" />	379 type="chrome_html" />

380 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"	380 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"

381 file="prefs/prefs_types.js"	381 file="prefs/prefs_types.js"

382 type="chrome_html" />	382 type="chrome_html" />

383 <structure name="IDR_SETTINGS_PREF_TRACKER_HTML"	383 <structure name="IDR_SETTINGS_PREF_TRACKER_HTML"

384 file="pref_tracker/pref_tracker.html"	384 file="pref_tracker/pref_tracker.html"

385 type="chrome_html" />	385 type="chrome_html" />

386 <structure name="IDR_SETTINGS_PREF_TRACKER_JS"	386 <structure name="IDR_SETTINGS_PREF_TRACKER_JS"

387 file="pref_tracker/pref_tracker.js"	387 file="pref_tracker/pref_tracker.js"

388 type="chrome_html" />	388 type="chrome_html" />

	389 <structure name="IDR_SETTINGS_PREFS_PRIVATE_API_HTML"

	390 file="site_settings/prefs_private_api.html"

	391 type="chrome_html" />

	392 <structure name="IDR_SETTINGS_PREFS_PRIVATE_API_JS"

	393 file="site_settings/prefs_private_api.js"

	394 type="chrome_html" />

389 <structure name="IDR_SETTINGS_PRIVACY_PAGE_CSS"	395 <structure name="IDR_SETTINGS_PRIVACY_PAGE_CSS"

390 file="privacy_page/privacy_page.css"	396 file="privacy_page/privacy_page.css"

391 type="chrome_html" />	397 type="chrome_html" />

392 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"	398 <structure name="IDR_SETTINGS_PRIVACY_PAGE_HTML"

393 file="privacy_page/privacy_page.html"	399 file="privacy_page/privacy_page.html"

394 type="chrome_html"	400 type="chrome_html"

395 flattenhtml="true"	401 flattenhtml="true"

396 allowexternalscript="true" />	402 allowexternalscript="true" />

397 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"	403 <structure name="IDR_SETTINGS_PRIVACY_PAGE_JS"

398 file="privacy_page/privacy_page.js"	404 file="privacy_page/privacy_page.js"

(...skipping 357 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
756 type="chrome_html"	762 type="chrome_html"

757 flattenhtml="true"	763 flattenhtml="true"

758 allowexternalscript="true" />	764 allowexternalscript="true" />

759 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	765 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

760 file="people_page/users_page.css"	766 file="people_page/users_page.css"

761 type="chrome_html" />	767 type="chrome_html" />

762 </if>	768 </if>

763 </structures>	769 </structures>

764 </release>	770 </release>

765 </grit>	771 </grit>

OLD	NEW