chrome/browser/resources/settings/settings_resources.grd - Issue 1358433003: MD Settings: Make PolicyControllable behavior for isPolicyControlled()

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

Issue 1358433003: MD Settings: Make PolicyControllable behavior for isPolicyControlled() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: i have brought great shame upon us Created 5 years, 3 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/policy_controllable/policy_controllable.js ('k') | chrome/browser/web_dev_style/js_checker.py » ('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 166 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
177 file="languages_page/languages_page.css"	177 file="languages_page/languages_page.css"

178 type="chrome_html" />	178 type="chrome_html" />

179 <structure name="IDR_SETTINGS_LANGUAGES_PAGE_HTML"	179 <structure name="IDR_SETTINGS_LANGUAGES_PAGE_HTML"

180 file="languages_page/languages_page.html"	180 file="languages_page/languages_page.html"

181 type="chrome_html"	181 type="chrome_html"

182 flattenhtml="true"	182 flattenhtml="true"

183 allowexternalscript="true" />	183 allowexternalscript="true" />

184 <structure name="IDR_SETTINGS_LANGUAGES_PAGE_JS"	184 <structure name="IDR_SETTINGS_LANGUAGES_PAGE_JS"

185 file="languages_page/languages_page.js"	185 file="languages_page/languages_page.js"

186 type="chrome_html" />	186 type="chrome_html" />

	187 <structure name="IDR_SETTINGS_POLICY_CONTROLLABLE_HTML"

	188 file="policy_controllable/policy_controllable.html"

	189 type="chrome_html" />

	190 <structure name="IDR_SETTINGS_POLICY_CONTROLLABLE_JS"

	191 file="policy_controllable/policy_controllable.js"

	192 type="chrome_html" />

187 <structure name="IDR_SETTINGS_PREFS_HTML"	193 <structure name="IDR_SETTINGS_PREFS_HTML"

188 file="prefs/prefs.html"	194 file="prefs/prefs.html"

189 type="chrome_html" />	195 type="chrome_html" />

190 <structure name="IDR_SETTINGS_PREFS_JS"	196 <structure name="IDR_SETTINGS_PREFS_JS"

191 file="prefs/prefs.js"	197 file="prefs/prefs.js"

192 type="chrome_html" />	198 type="chrome_html" />

193 <structure name="IDR_SETTINGS_PREFS_TYPES_HTML"	199 <structure name="IDR_SETTINGS_PREFS_TYPES_HTML"

194 file="prefs/prefs_types.html"	200 file="prefs/prefs_types.html"

195 type="chrome_html" />	201 type="chrome_html" />

196 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"	202 <structure name="IDR_SETTINGS_PREFS_TYPES_JS"

(...skipping 261 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
458 type="chrome_html"	464 type="chrome_html"

459 flattenhtml="true"	465 flattenhtml="true"

460 allowexternalscript="true" />	466 allowexternalscript="true" />

461 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	467 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

462 file="users_page/users_page.css"	468 file="users_page/users_page.css"

463 type="chrome_html" />	469 type="chrome_html" />

464 </if>	470 </if>

465 </structures>	471 </structures>

466 </release>	472 </release>

467 </grit>	473 </grit>

OLD	NEW