summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 18:41:15 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-15 18:41:15 +0000
commit8ecdd840a7c01d96cb197b82f8da01f4a704b807 (patch)
tree664d085199cb8f5d773563d2714a67b143a5724c /ui/resources
parent3ed7496fcf01af71b591fa3ced274cfbdad78c9f (diff)
downloadchromium_src-8ecdd840a7c01d96cb197b82f8da01f4a704b807.zip
chromium_src-8ecdd840a7c01d96cb197b82f8da01f4a704b807.tar.gz
chromium_src-8ecdd840a7c01d96cb197b82f8da01f4a704b807.tar.bz2
Another set of icons for the launcher. The chrome logo now shows the
app list, hence code changes to shuffle things around. BUG=none TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8957012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114666 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/aura/applist.pngbin1350 -> 3219 bytes
-rwxr-xr-x[-rw-r--r--]ui/resources/aura/applist_h.pngbin1371 -> 3328 bytes
-rwxr-xr-x[-rw-r--r--]ui/resources/aura/applist_p.pngbin1202 -> 3216 bytes
-rw-r--r--ui/resources/aura/chromium-32.pngbin1180 -> 0 bytes
-rw-r--r--ui/resources/aura/new_browser.pngbin0 -> 1360 bytes
-rw-r--r--ui/resources/aura/new_browser_h.pngbin0 -> 1367 bytes
-rw-r--r--ui/resources/aura/new_browser_p.pngbin0 -> 1573 bytes
-rw-r--r--ui/resources/ui_resources.grd4
8 files changed, 3 insertions, 1 deletions
diff --git a/ui/resources/aura/applist.png b/ui/resources/aura/applist.png
index 6356352..5f89378 100644
--- 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
index a79c08a..462f8df 100644..100755
--- a/ui/resources/aura/applist_h.png
+++ 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
index 7bb7b4d..2485200 100644..100755
--- a/ui/resources/aura/applist_p.png
+++ b/ui/resources/aura/applist_p.png
Binary files differ
diff --git a/ui/resources/aura/chromium-32.png b/ui/resources/aura/chromium-32.png
deleted file mode 100644
index 5e3adba..0000000
--- a/ui/resources/aura/chromium-32.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/aura/new_browser.png b/ui/resources/aura/new_browser.png
new file mode 100644
index 0000000..e12dd7c
--- /dev/null
+++ b/ui/resources/aura/new_browser.png
Binary files differ
diff --git a/ui/resources/aura/new_browser_h.png b/ui/resources/aura/new_browser_h.png
new file mode 100644
index 0000000..68cd141
--- /dev/null
+++ b/ui/resources/aura/new_browser_h.png
Binary files differ
diff --git a/ui/resources/aura/new_browser_p.png b/ui/resources/aura/new_browser_p.png
new file mode 100644
index 0000000..aa99b75
--- /dev/null
+++ b/ui/resources/aura/new_browser_p.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index a67f53e..5bd9a37 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -133,7 +133,9 @@
<!-- Images only used by Aura. -->
<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_NEW_BROWSER" file="aura/new_browser.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_HOT" file="aura/new_browser_h.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_NEW_BROWSER_PUSHED" file="aura/new_browser_p.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" />