chrome/browser/resources/settings/settings_resources.grd - Issue 1277223002: Add cr-network-select element for selecting a Chrome OS network

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

Issue 1277223002: Add cr-network-select element for selecting a Chrome OS network (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_515987_network_configure

Patch Set: Compile fix Created 5 years, 4 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/internet_page/network_summary_item.html ('k') | chrome/browser/ui/webui/chromeos/network_ui.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 244 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
255 type="chrome_html" />	255 type="chrome_html" />

256 <structure name="IDR_SETTINGS_NETWORK_IP_CONFIG_CSS"	256 <structure name="IDR_SETTINGS_NETWORK_IP_CONFIG_CSS"

257 file="internet_page/network_ip_config.css"	257 file="internet_page/network_ip_config.css"

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

259 <structure name="IDR_SETTINGS_NETWORK_IP_CONFIG_HTML"	259 <structure name="IDR_SETTINGS_NETWORK_IP_CONFIG_HTML"

260 file="internet_page/network_ip_config.html"	260 file="internet_page/network_ip_config.html"

261 type="chrome_html" />	261 type="chrome_html" />

262 <structure name="IDR_SETTINGS_NETWORK_IP_CONFIG_JS"	262 <structure name="IDR_SETTINGS_NETWORK_IP_CONFIG_JS"

263 file="internet_page/network_ip_config.js"	263 file="internet_page/network_ip_config.js"

264 type="chrome_html" />	264 type="chrome_html" />

265 <structure name="IDR_SETTINGS_NETWORK_LIST_CSS"

266 file="internet_page/network_list.css"

267 type="chrome_html" />

268 <structure name="IDR_SETTINGS_NETWORK_LIST_HTML"

269 file="internet_page/network_list.html"

270 type="chrome_html" />

271 <structure name="IDR_SETTINGS_NETWORK_LIST_JS"

272 file="internet_page/network_list.js"

273 type="chrome_html" />

274 <structure name="IDR_SETTINGS_NETWORK_LIST_ITEM_CSS"

275 file="internet_page/network_list_item.css"

276 type="chrome_html" />

277 <structure name="IDR_SETTINGS_NETWORK_LIST_ITEM_HTML"

278 file="internet_page/network_list_item.html"

279 type="chrome_html" />

280 <structure name="IDR_SETTINGS_NETWORK_LIST_ITEM_JS"

281 file="internet_page/network_list_item.js"

282 type="chrome_html" />

283 <structure name="IDR_SETTINGS_NETWORK_NAMESERVERS_CSS"	265 <structure name="IDR_SETTINGS_NETWORK_NAMESERVERS_CSS"

284 file="internet_page/network_nameservers.css"	266 file="internet_page/network_nameservers.css"

285 type="chrome_html" />	267 type="chrome_html" />

286 <structure name="IDR_SETTINGS_NETWORK_NAMESERVERS_HTML"	268 <structure name="IDR_SETTINGS_NETWORK_NAMESERVERS_HTML"

287 file="internet_page/network_nameservers.html"	269 file="internet_page/network_nameservers.html"

288 type="chrome_html" />	270 type="chrome_html" />

289 <structure name="IDR_SETTINGS_NETWORK_NAMESERVERS_JS"	271 <structure name="IDR_SETTINGS_NETWORK_NAMESERVERS_JS"

290 file="internet_page/network_nameservers.js"	272 file="internet_page/network_nameservers.js"

291 type="chrome_html" />	273 type="chrome_html" />

292 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_CSS"	274 <structure name="IDR_SETTINGS_NETWORK_PROPERTY_LIST_CSS"

(...skipping 78 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
371 type="chrome_html"	353 type="chrome_html"

372 flattenhtml="true"	354 flattenhtml="true"

373 allowexternalscript="true" />	355 allowexternalscript="true" />

374 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"	356 <structure name="IDR_SETTINGS_USERS_PAGE_CSS"

375 file="users_page/users_page.css"	357 file="users_page/users_page.css"

376 type="chrome_html" />	358 type="chrome_html" />

377 </if>	359 </if>

378 </structures>	360 </structures>

379 </release>	361 </release>

380 </grit>	362 </grit>

OLD	NEW