summaryrefslogtreecommitdiffstats
path: root/ash/resources
diff options
context:
space:
mode:
authorygorshenin@google.com <ygorshenin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-03 08:37:04 +0000
committerygorshenin@google.com <ygorshenin@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-03 08:37:04 +0000
commitc3179369c26e02ed206dccdc5ca80021a0640bcd (patch)
treef30b6f4d8715a0a35b90411ee2a142c18ca98681 /ash/resources
parent4c0524ce03408edd9adc34e98dea0951557f22c2 (diff)
downloadchromium_src-c3179369c26e02ed206dccdc5ca80021a0640bcd.zip
chromium_src-c3179369c26e02ed206dccdc5ca80021a0640bcd.tar.gz
chromium_src-c3179369c26e02ed206dccdc5ca80021a0640bcd.tar.bz2
Added a special badge to wifi-networks behind a captive portal.
BUG=240237 TEST=manual tests on Lumpy R=oshima@chromium.org, stevenjb@chromium.org Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=254079 Review URL: https://codereview.chromium.org/175053003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/resources')
-rw-r--r--ash/resources/ash_resources.grd2
-rw-r--r--ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_dark.pngbin0 -> 213 bytes
-rw-r--r--ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_light.pngbin0 -> 224 bytes
-rw-r--r--ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_dark.pngbin0 -> 306 bytes
-rw-r--r--ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_light.pngbin0 -> 306 bytes
5 files changed, 2 insertions, 0 deletions
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 3d4b39c..6fd4254 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -209,6 +209,8 @@
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_LIGHT" file="cros/network/statusbar_network_lte_light.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_DARK" file="cros/network/statusbar_network_lte_advanced_dark.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_LTE_ADVANCED_LIGHT" file="cros/network/statusbar_network_lte_advanced_light.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_PORTAL_DARK" file="cros/network/statusbar_network_active_portal_dark.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_PORTAL_LIGHT" file="cros/network/statusbar_network_active_portal_light.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_DARK" file="cros/network/statusbar_network_roaming_dark.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT" file="cros/network/statusbar_network_roaming_light.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_SECURE_DARK" file="cros/network/statusbar_network_secure_dark.png" />
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_dark.png b/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_dark.png
new file mode 100644
index 0000000..58c678f
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_dark.png
Binary files differ
diff --git a/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_light.png b/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_light.png
new file mode 100644
index 0000000..231a010
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/network/statusbar_network_active_portal_light.png
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_dark.png b/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_dark.png
new file mode 100644
index 0000000..2fed1dc
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_dark.png
Binary files differ
diff --git a/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_light.png b/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_light.png
new file mode 100644
index 0000000..c7c4c5a
--- /dev/null
+++ b/ash/resources/default_200_percent/cros/network/statusbar_network_active_portal_light.png
Binary files differ