ui/webui/resources/webui_resources.grd - Issue 874283006: Add custom Polymer network icon element

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/webui/resources/webui_resources.grd

Issue 874283006: Add custom Polymer network icon element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View side-by-side diff with in-line comments

« ui/webui/resources/js/cr/polymer_elements/cr_network_icon/cr-network-icon.js ('K') | « ui/webui/resources/js/cr/polymer_elements/cr_network_icon/cr-network-icon.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/webui/resources/webui_resources.grd

diff --git a/ui/webui/resources/webui_resources.grd b/ui/webui/resources/webui_resources.grd

index 38897fa747292246c366fe003ed59b0a88f3b2fd..4234d2b74e50be141a8834828c830bc9aa70161e 100644

--- a/ui/webui/resources/webui_resources.grd

+++ b/ui/webui/resources/webui_resources.grd

@@ -202,6 +202,21 @@ without changes to the corresponding grd file. -->

file="images/trash.png" type="BINDATA" />

<include name="IDR_WEBUI_IMAGES_CLOUDS"

file="images/clouds.png" type="BINDATA" />

+ <include name="IDR_WEBUI_CR_NETWORK_ICON_ETHERNET"

+ file="images/polymer_elements/cr_network_icon/ethernet.png"

+ type="BINDATA" />

+ <include name="IDR_WEBUI_CR_NETWORK_ICON_WIFI"

+ file="images/polymer_elements/cr_network_icon/wifi.png"

+ type="BINDATA" />

+ <include name="IDR_WEBUI_CR_NETWORK_ICON_MOBILE"

+ file="images/polymer_elements/cr_network_icon/mobile.png"

+ type="BINDATA" />

+ <include name="IDR_WEBUI_CR_NETWORK_ICON_VPN"

+ file="images/polymer_elements/cr_network_icon/vpn.png"

+ type="BINDATA" />

+ <include name="IDR_WEBUI_CR_NETWORK_ICON_SECURE"

+ file="images/polymer_elements/cr_network_icon/secure.png"

+ type="BINDATA" />

</includes>

<structure name="IDR_WEBUI_CSS_ALERT_OVERLAY"

@@ -264,6 +279,12 @@ without changes to the corresponding grd file. -->

file="js/cr/event_target.js" type="chrome_html" />

<structure name="IDR_WEBUI_JS_CR_LINK_CONTROLLER"

file="js/cr/link_controller.js" type="chrome_html" />

+ <structure name="IDR_WEBUI_JS_CR_NETWORK_ICON_CSS"

+ file="js/cr/polymer_elements/cr_network_icon/cr-network-icon.css" type="chrome_html" />

+ <structure name="IDR_WEBUI_JS_CR_NETWORK_ICON_HTML"

+ file="js/cr/polymer_elements/cr_network_icon/cr-network-icon.html" type="chrome_html" />

+ <structure name="IDR_WEBUI_JS_CR_NETWORK_ICON_JS"

+ file="js/cr/polymer_elements/cr_network_icon/cr-network-icon.js" type="chrome_html" />

<structure name="IDR_WEBUI_JS_CR_UI"

file="js/cr/ui.js" type="chrome_html" />

<structure name="IDR_WEBUI_JS_CR_UI_ALERT_OVERLAY"

@@ -376,8 +397,6 @@ without changes to the corresponding grd file. -->

file="js/parse_html_subset.js" type="chrome_html" />

<structure name="IDR_WEBUI_JS_UTIL"

file="js/util.js" type="chrome_html" flattenhtml="true" />

- <structure name="IDR_WEBUI_JS_WEBUI_RESOURCE_TEST"

- file="js/webui_resource_test.js" type="chrome_html" />

<structure name="IDR_WEBUI_CSS_UI_ACCOUNT_TWEAKS"

file="css/chromeos/ui_account_tweaks.css"