summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authorbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 17:56:38 +0000
committerbartfab@chromium.org <bartfab@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 17:56:38 +0000
commit5af422c2fbb4deb11f807fcf6fba16466d3dbcfc (patch)
treead2f3188cab159845744ce79269d0528b3bc4986 /ash
parent0daee5f2a0b74e36a809bb7618a5f9db82f2502a (diff)
downloadchromium_src-5af422c2fbb4deb11f807fcf6fba16466d3dbcfc.zip
chromium_src-5af422c2fbb4deb11f807fcf6fba16466d3dbcfc.tar.gz
chromium_src-5af422c2fbb4deb11f807fcf6fba16466d3dbcfc.tar.bz2
Add image assets for TrayPopupTextButton's border
This CL adds the assets required to switch TrayPopupTextButton's border from native drawing to images. BUG=152928,155363 Review URL: https://codereview.chromium.org/11316081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/resources/ash_resources.grd4
-rw-r--r--ash/resources/default_100_percent/common/tray_popup_label_button_border.pngbin0 -> 82 bytes
-rw-r--r--ash/resources/default_100_percent/common/tray_popup_label_button_hover_background.pngbin0 -> 83 bytes
-rw-r--r--ash/resources/default_100_percent/common/tray_popup_label_button_normal_background.pngbin0 -> 81 bytes
-rw-r--r--ash/resources/default_100_percent/common/tray_popup_public_account_logout_button_border.pngbin0 -> 83 bytes
-rw-r--r--ash/resources/default_200_percent/common/tray_popup_label_button_border.pngbin0 -> 84 bytes
-rw-r--r--ash/resources/default_200_percent/common/tray_popup_label_button_hover_background.pngbin0 -> 86 bytes
-rw-r--r--ash/resources/default_200_percent/common/tray_popup_label_button_normal_background.pngbin0 -> 81 bytes
-rw-r--r--ash/resources/default_200_percent/common/tray_popup_public_account_logout_button_border.pngbin0 -> 86 bytes
9 files changed, 4 insertions, 0 deletions
diff --git a/ash/resources/ash_resources.grd b/ash/resources/ash_resources.grd
index addc805..39e5b41 100644
--- a/ash/resources/ash_resources.grd
+++ b/ash/resources/ash_resources.grd
@@ -74,6 +74,10 @@
<structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP" file="common/resize_shadow_top.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP_LEFT" file="common/resize_shadow_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_TOP_RIGHT" file="common/resize_shadow_top_right.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_TRAY_POPUP_LABEL_BUTTON_BORDER" file="common/tray_popup_label_button_border.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_TRAY_POPUP_LABEL_BUTTON_HOVER_BACKGROUND" file="common/tray_popup_label_button_hover_background.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_TRAY_POPUP_LABEL_BUTTON_NORMAL_BACKGROUND" file="common/tray_popup_label_button_normal_background.png" />
+ <structure type="chrome_scaled_image" name="IDR_AURA_TRAY_POPUP_PUBLIC_ACCOUNT_LOGOUT_BUTTON_BORDER" file="common/tray_popup_public_account_logout_button_border.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY" file="common/status_accessibility_mode.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK" file="common/status_accessibility_dark.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_BLUETOOTH" file="common/status_bluetooth.png" />
diff --git a/ash/resources/default_100_percent/common/tray_popup_label_button_border.png b/ash/resources/default_100_percent/common/tray_popup_label_button_border.png
new file mode 100644
index 0000000..0fdb795
--- /dev/null
+++ b/ash/resources/default_100_percent/common/tray_popup_label_button_border.png
Binary files differ
diff --git a/ash/resources/default_100_percent/common/tray_popup_label_button_hover_background.png b/ash/resources/default_100_percent/common/tray_popup_label_button_hover_background.png
new file mode 100644
index 0000000..2ebad3e
--- /dev/null
+++ b/ash/resources/default_100_percent/common/tray_popup_label_button_hover_background.png
Binary files differ
diff --git a/ash/resources/default_100_percent/common/tray_popup_label_button_normal_background.png b/ash/resources/default_100_percent/common/tray_popup_label_button_normal_background.png
new file mode 100644
index 0000000..2a22654
--- /dev/null
+++ b/ash/resources/default_100_percent/common/tray_popup_label_button_normal_background.png
Binary files differ
diff --git a/ash/resources/default_100_percent/common/tray_popup_public_account_logout_button_border.png b/ash/resources/default_100_percent/common/tray_popup_public_account_logout_button_border.png
new file mode 100644
index 0000000..2ebad3e
--- /dev/null
+++ b/ash/resources/default_100_percent/common/tray_popup_public_account_logout_button_border.png
Binary files differ
diff --git a/ash/resources/default_200_percent/common/tray_popup_label_button_border.png b/ash/resources/default_200_percent/common/tray_popup_label_button_border.png
new file mode 100644
index 0000000..3c95686
--- /dev/null
+++ b/ash/resources/default_200_percent/common/tray_popup_label_button_border.png
Binary files differ
diff --git a/ash/resources/default_200_percent/common/tray_popup_label_button_hover_background.png b/ash/resources/default_200_percent/common/tray_popup_label_button_hover_background.png
new file mode 100644
index 0000000..97a9833
--- /dev/null
+++ b/ash/resources/default_200_percent/common/tray_popup_label_button_hover_background.png
Binary files differ
diff --git a/ash/resources/default_200_percent/common/tray_popup_label_button_normal_background.png b/ash/resources/default_200_percent/common/tray_popup_label_button_normal_background.png
new file mode 100644
index 0000000..6d0aad7
--- /dev/null
+++ b/ash/resources/default_200_percent/common/tray_popup_label_button_normal_background.png
Binary files differ
diff --git a/ash/resources/default_200_percent/common/tray_popup_public_account_logout_button_border.png b/ash/resources/default_200_percent/common/tray_popup_public_account_logout_button_border.png
new file mode 100644
index 0000000..97a9833
--- /dev/null
+++ b/ash/resources/default_200_percent/common/tray_popup_public_account_logout_button_border.png
Binary files differ