summaryrefslogtreecommitdiffstats
path: root/ash/resources
diff options
context:
space:
mode:
authorantrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 19:32:28 +0000
committerantrim@chromium.org <antrim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-29 19:32:28 +0000
commit19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9 (patch)
tree63d883b332350774d874cc55474d328be9c3f46f /ash/resources
parent4439bc7b04fe41643fb35fffeb86e29ef2cf9a47 (diff)
downloadchromium_src-19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9.zip
chromium_src-19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9.tar.gz
chromium_src-19f39da029a70f0b8fcd0cc554be54ce7c0ec7d9.tar.bz2
Add stub icons for playpen.
+remove separators in creation dialogs. TBR=derat@chromium.org, nkostylev@chromium.org, oshima@chromium.org NOTRY=true Because of changes in binaries. BUG=229762 Review URL: https://codereview.chromium.org/16103006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/resources')
-rw-r--r--ash/resources/ash_resources.grd1
-rw-r--r--ash/resources/default_100_percent/cros/status/status_managed_mode_user.pngbin0 -> 1455 bytes
2 files changed, 1 insertions, 0 deletions
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index 4e00cc5..a58f07f 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -130,6 +130,7 @@
<!-- ChromeOS specific icons -->
<if expr="pp_ifdef('chromeos')">
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE_DARK" file="cros/status/status_managed.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_USER" file="cros/status/status_managed_mode_user.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1X" file="cros/network/statusbar_network_1x.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_DARK" file="cros/network/statusbar_network_3g_dark.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT" file="cros/network/statusbar_network_3g_light.png" />
diff --git a/ash/resources/default_100_percent/cros/status/status_managed_mode_user.png b/ash/resources/default_100_percent/cros/status/status_managed_mode_user.png
new file mode 100644
index 0000000..e2ab494
--- /dev/null
+++ b/ash/resources/default_100_percent/cros/status/status_managed_mode_user.png
Binary files differ