chrome/browser/resources/settings/settings_resources.grd - Issue 2461113002: WebUI: Make settings-action-menu re-usable as cr-action-menu.

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

Issue 2461113002: WebUI: Make settings-action-menu re-usable as cr-action-menu. (Closed)

Patch Set: getComputedStyle instead of util.js Created 4 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

« no previous file with comments | « chrome/browser/resources/settings/settings_action_menu.js ('k') | chrome/browser/resources/settings/site_settings/compiled_resources2.gyp » ('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 226 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
237 file="md_select_css.html"	237 file="md_select_css.html"

238 type="chrome_html"	238 type="chrome_html"

239 flattenhtml="true" />	239 flattenhtml="true" />

240 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"	240 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"

241 file="settings_ui/settings_ui.html"	241 file="settings_ui/settings_ui.html"

242 type="chrome_html" />	242 type="chrome_html" />

243 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"	243 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"

244 file="settings_ui/settings_ui.js"	244 file="settings_ui/settings_ui.js"

245 type="chrome_html"	245 type="chrome_html"

246 flattenhtml="true" />	246 flattenhtml="true" />

247 <structure name="IDR_SETTINGS_SETTINGS_ACTION_MENU_HTML"

248 file="settings_action_menu.html"

249 type="chrome_html" />

250 <structure name="IDR_SETTINGS_SETTINGS_ACTION_MENU_JS"

251 file="settings_action_menu.js"

252 type="chrome_html" />

253 <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_HTML"	247 <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_HTML"

254 file="global_scroll_target_behavior.html"	248 file="global_scroll_target_behavior.html"

255 type="chrome_html" />	249 type="chrome_html" />

256 <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_JS"	250 <structure name="IDR_SETTINGS_GLOBAL_SCROLL_TARGET_BEHAVIOR_JS"

257 file="global_scroll_target_behavior.js"	251 file="global_scroll_target_behavior.js"

258 type="chrome_html" />	252 type="chrome_html" />

259 <if expr="use_nss_certs">	253 <if expr="use_nss_certs">

260 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"	254 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"

261 file="certificate_manager_page/certificate_manager_page.html"	255 file="certificate_manager_page/certificate_manager_page.html"

262 type="chrome_html" />	256 type="chrome_html" />

(...skipping 892 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1155 type="chrome_html" />	1149 type="chrome_html" />

1156 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1150 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1157 file="people_page/users_page.html"	1151 file="people_page/users_page.html"

1158 type="chrome_html"	1152 type="chrome_html"

1159 flattenhtml="true"	1153 flattenhtml="true"

1160 allowexternalscript="true" />	1154 allowexternalscript="true" />

1161 </if>	1155 </if>

1162 </structures>	1156 </structures>

1163 </release>	1157 </release>

1164 </grit>	1158 </grit>

OLD	NEW