chrome/browser/resources/settings/settings_resources.grd - Issue 1632403003: [MD settings] download mocks changes; added disable option for google drive

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

Issue 1632403003: [MD settings] download mocks changes; added disable option for google drive (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge with master Created 4 years, 11 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/downloads_page/downloads_page.html ('k') | chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.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">	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 207 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
218 allowexternalscript="true" />	218 allowexternalscript="true" />

219 <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_JS"	219 <structure name="IDR_SETTINGS_DEFAULT_BROWSER_PAGE_JS"

220 file="default_browser_page/default_browser_page.js"	220 file="default_browser_page/default_browser_page.js"

221 type="chrome_html" />	221 type="chrome_html" />

222 </if>	222 </if>

223 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_CSS"	223 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_CSS"

224 file="downloads_page/downloads_page.css"	224 file="downloads_page/downloads_page.css"

225 type="chrome_html" />	225 type="chrome_html" />

226 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_HTML"	226 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_HTML"

227 file="downloads_page/downloads_page.html"	227 file="downloads_page/downloads_page.html"

228 type="chrome_html" />	228 type="chrome_html"

	229 flattenhtml="true"

	230 allowexternalscript="true" />
	stevenjb 2016/01/27 19:30:18 Remind me why exactly we need each of these? Remind me why exactly we need each of these? Dan Beam 2016/01/27 19:31:37 flatten: grit allowexternalscript: no idea, but it Show quoted text On 2016/01/27 19:30:18, stevenjb wrote: > Remind me why exactly we need each of these? flatten: grit allowexternalscript: no idea, but it probably matters
229 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_JS"	231 <structure name="IDR_SETTINGS_DOWNLOADS_PAGE_JS"

230 file="downloads_page/downloads_page.js"	232 file="downloads_page/downloads_page.js"

231 type="chrome_html" />	233 type="chrome_html" />

232 <structure name="IDR_SETTINGS_I18n_SETUP_HTML"	234 <structure name="IDR_SETTINGS_I18n_SETUP_HTML"

233 file="i18n_setup.html"	235 file="i18n_setup.html"

234 type="chrome_html" />	236 type="chrome_html" />

235 <structure name="IDR_SETTINGS_ICONS"	237 <structure name="IDR_SETTINGS_ICONS"

236 file="icons.html"	238 file="icons.html"

237 type="chrome_html" />	239 type="chrome_html" />

238 <structure name="IDR_SETTINGS_POWERWASH_DIALOG_HTML"	240 <structure name="IDR_SETTINGS_POWERWASH_DIALOG_HTML"

(...skipping 506 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
745 type="chrome_html"	747 type="chrome_html"

746 flattenhtml="true"	748 flattenhtml="true"

747 allowexternalscript="true" />	749 allowexternalscript="true" />

748 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	750 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

749 file="people_page/users_page.css"	751 file="people_page/users_page.css"

750 type="chrome_html" />	752 type="chrome_html" />

751 </if>	753 </if>

752 </structures>	754 </structures>

753 </release>	755 </release>

754 </grit>	756 </grit>

OLD	NEW