chrome/browser/resources/settings/settings_resources.grd - Issue 2378253003: MD Settings: Search page, switching paper-dropdown-menu to native select.

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

Issue 2378253003: MD Settings: Search page, switching paper-dropdown-menu to native select. (Closed)

Patch Set: Merge conflicts. Created 4 years, 2 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:

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 215 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
226 <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_JS"	226 <structure name="IDR_SETTINGS_MAIN_PAGE_BEHAVIOR_JS"

227 file="settings_page/main_page_behavior.js"	227 file="settings_page/main_page_behavior.js"

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

229 <structure name="IDR_SETTINGS_SETTINGS_VARS_CSS_HTML"	229 <structure name="IDR_SETTINGS_SETTINGS_VARS_CSS_HTML"

230 file="settings_vars_css.html"	230 file="settings_vars_css.html"

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

232 <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"	232 <structure name="IDR_SETTINGS_SETTINGS_SHARED_CSS_HTML"

233 file="settings_shared_css.html"	233 file="settings_shared_css.html"

234 type="chrome_html"	234 type="chrome_html"

235 flattenhtml="true" />	235 flattenhtml="true" />

	236 <structure name="IDR_SETTINGS_SELECT_CSS_HTML"

	237 file="select_css.html"

	238 type="chrome_html" />

236 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"	239 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_HTML"

237 file="settings_ui/settings_ui.html"	240 file="settings_ui/settings_ui.html"

238 type="chrome_html" />	241 type="chrome_html" />

239 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"	242 <structure name="IDR_SETTINGS_CR_SETTINGS_UI_JS"

240 file="settings_ui/settings_ui.js"	243 file="settings_ui/settings_ui.js"

241 type="chrome_html"	244 type="chrome_html"

242 flattenhtml="true" />	245 flattenhtml="true" />

243 <if expr="use_nss_certs">	246 <if expr="use_nss_certs">

244 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"	247 <structure name="IDR_SETTINGS_CERTIFICATE_MANAGER_PAGE_HTML"

245 file="certificate_manager_page/certificate_manager_page.html"	248 file="certificate_manager_page/certificate_manager_page.html"

(...skipping 863 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1109 type="chrome_html" />	1112 type="chrome_html" />

1110 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"	1113 <structure name="IDR_SETTINGS_USERS_PAGE_HTML"

1111 file="people_page/users_page.html"	1114 file="people_page/users_page.html"

1112 type="chrome_html"	1115 type="chrome_html"

1113 flattenhtml="true"	1116 flattenhtml="true"

1114 allowexternalscript="true" />	1117 allowexternalscript="true" />

1115 </if>	1118 </if>

1116 </structures>	1119 </structures>

1117 </release>	1120 </release>

1118 </grit>	1121 </grit>

OLD	NEW

« no previous file with comments | « chrome/browser/resources/settings/select_css.html ('k') | chrome/test/data/webui/settings/search_page_test.js » ('j') | no next file with comments »