summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-13 18:17:38 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-13 18:17:38 +0000
commitfc4cd8c326cb3dfd4b791df34109dfdb5db1bcae (patch)
treeb437488ff2d6f376172b80560f0224c26a84946c /ui/resources
parentf51223594a70d2a57d71d8bef7f8004597ceca23 (diff)
downloadchromium_src-fc4cd8c326cb3dfd4b791df34109dfdb5db1bcae.zip
chromium_src-fc4cd8c326cb3dfd4b791df34109dfdb5db1bcae.tar.gz
chromium_src-fc4cd8c326cb3dfd4b791df34109dfdb5db1bcae.tar.bz2
New launcher images. Will wire up separately.
BUG=105900 TEST=none R=ben@chromium.org TBR=ben@chromium.org Review URL: http://codereview.chromium.org/8934007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114232 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rwxr-xr-x[-rw-r--r--]ui/resources/aura/applist.pngbin1181 -> 1350 bytes
-rwxr-xr-xui/resources/aura/applist_h.pngbin0 -> 1371 bytes
-rwxr-xr-xui/resources/aura/applist_p.pngbin0 -> 1202 bytes
-rwxr-xr-x[-rw-r--r--]ui/resources/aura/browser_instance_1.pngbin1468 -> 1420 bytes
-rwxr-xr-xui/resources/aura/browser_instance_1_h.pngbin0 -> 1451 bytes
-rwxr-xr-xui/resources/aura/browser_instance_1_p.pngbin0 -> 1427 bytes
-rwxr-xr-x[-rw-r--r--]ui/resources/aura/browser_instance_2.pngbin1568 -> 1537 bytes
-rwxr-xr-xui/resources/aura/browser_instance_2_h.pngbin0 -> 1559 bytes
-rwxr-xr-xui/resources/aura/browser_instance_2_p.pngbin0 -> 1548 bytes
-rwxr-xr-x[-rw-r--r--]ui/resources/aura/browser_instance_3.pngbin1630 -> 1581 bytes
-rwxr-xr-xui/resources/aura/browser_instance_3_h.pngbin0 -> 1608 bytes
-rwxr-xr-xui/resources/aura/browser_instance_3_p.pngbin0 -> 1586 bytes
-rw-r--r--ui/resources/aura/launcher_overflow.pngbin1695 -> 1419 bytes
-rwxr-xr-xui/resources/aura/launcher_overflow_h.pngbin0 -> 1462 bytes
-rwxr-xr-xui/resources/aura/launcher_overflow_p.pngbin0 -> 1419 bytes
-rw-r--r--ui/resources/ui_resources.grd10
16 files changed, 10 insertions, 0 deletions
diff --git a/ui/resources/aura/applist.png b/ui/resources/aura/applist.png
index e23f708..6356352 100644..100755
--- a/ui/resources/aura/applist.png
+++ b/ui/resources/aura/applist.png
Binary files differ
diff --git a/ui/resources/aura/applist_h.png b/ui/resources/aura/applist_h.png
new file mode 100755
index 0000000..a79c08a
--- /dev/null
+++ b/ui/resources/aura/applist_h.png
Binary files differ
diff --git a/ui/resources/aura/applist_p.png b/ui/resources/aura/applist_p.png
new file mode 100755
index 0000000..7bb7b4d
--- /dev/null
+++ b/ui/resources/aura/applist_p.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_1.png b/ui/resources/aura/browser_instance_1.png
index 2d4a1c4..a2d9f68 100644..100755
--- a/ui/resources/aura/browser_instance_1.png
+++ b/ui/resources/aura/browser_instance_1.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_1_h.png b/ui/resources/aura/browser_instance_1_h.png
new file mode 100755
index 0000000..0e8b0c5
--- /dev/null
+++ b/ui/resources/aura/browser_instance_1_h.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_1_p.png b/ui/resources/aura/browser_instance_1_p.png
new file mode 100755
index 0000000..3a17291
--- /dev/null
+++ b/ui/resources/aura/browser_instance_1_p.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_2.png b/ui/resources/aura/browser_instance_2.png
index f766f1e..2e90ba7 100644..100755
--- a/ui/resources/aura/browser_instance_2.png
+++ b/ui/resources/aura/browser_instance_2.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_2_h.png b/ui/resources/aura/browser_instance_2_h.png
new file mode 100755
index 0000000..9a4caa3
--- /dev/null
+++ b/ui/resources/aura/browser_instance_2_h.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_2_p.png b/ui/resources/aura/browser_instance_2_p.png
new file mode 100755
index 0000000..922043e
--- /dev/null
+++ b/ui/resources/aura/browser_instance_2_p.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_3.png b/ui/resources/aura/browser_instance_3.png
index 92be1c3..1cf7f96 100644..100755
--- a/ui/resources/aura/browser_instance_3.png
+++ b/ui/resources/aura/browser_instance_3.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_3_h.png b/ui/resources/aura/browser_instance_3_h.png
new file mode 100755
index 0000000..713506b
--- /dev/null
+++ b/ui/resources/aura/browser_instance_3_h.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_3_p.png b/ui/resources/aura/browser_instance_3_p.png
new file mode 100755
index 0000000..05537ea
--- /dev/null
+++ b/ui/resources/aura/browser_instance_3_p.png
Binary files differ
diff --git a/ui/resources/aura/launcher_overflow.png b/ui/resources/aura/launcher_overflow.png
index 5535278..2132bb1 100644
--- a/ui/resources/aura/launcher_overflow.png
+++ b/ui/resources/aura/launcher_overflow.png
Binary files differ
diff --git a/ui/resources/aura/launcher_overflow_h.png b/ui/resources/aura/launcher_overflow_h.png
new file mode 100755
index 0000000..e4c8c0e
--- /dev/null
+++ b/ui/resources/aura/launcher_overflow_h.png
Binary files differ
diff --git a/ui/resources/aura/launcher_overflow_p.png b/ui/resources/aura/launcher_overflow_p.png
new file mode 100755
index 0000000..c87e3af
--- /dev/null
+++ b/ui/resources/aura/launcher_overflow_p.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index 8763a51..1997752 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -135,10 +135,20 @@
<if expr="pp_ifdef('use_aura')">
<include name="IDR_AURA_LAUNCHER_ICON_CHROME" file="aura/chromium-32.png" type="BINDATA" />
<include name="IDR_AURA_LAUNCHER_OVERFLOW" file="aura/launcher_overflow.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_OVERFLOW_HOT" file="aura/launcher_overflow_h.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_OVERFLOW_PUSHED" file="aura/launcher_overflow_p.png" type="BINDATA" />
<include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_1" file="aura/browser_instance_1.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_1_HOT" file="aura/browser_instance_1_h.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_1_PUSHED" file="aura/browser_instance_1_p.png" type="BINDATA" />
<include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_2" file="aura/browser_instance_2.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_2_HOT" file="aura/browser_instance_2_h.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_2_PUSHED" file="aura/browser_instance_2_p.png" type="BINDATA" />
<include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_3" file="aura/browser_instance_3.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_3_HOT" file="aura/browser_instance_3_h.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_3_PUSHED" file="aura/browser_instance_3_p.png" type="BINDATA" />
<include name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="aura/applist.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="aura/applist_h.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="aura/applist_p.png" type="BINDATA" />
<include name="IDR_AURA_SHADOW_RECT_TOP_LEFT" file="aura/shadow_rect_top_left.png" type="BINDATA" />
<include name="IDR_AURA_SHADOW_RECT_TOP" file="aura/shadow_rect_top.png" type="BINDATA" />
<include name="IDR_AURA_SHADOW_RECT_TOP_RIGHT" file="aura/shadow_rect_top_right.png" type="BINDATA" />