summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-14 03:44:34 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-14 03:44:34 +0000
commit2fcd9d2dbe87c349113ed6512f701ef101fc295f (patch)
treed6ca089ec5d334020404be435f413dffd6646daa /ui/resources
parent9f2d2f4a768ea8edaf7a6ff2efa73214d25f6a61 (diff)
downloadchromium_src-2fcd9d2dbe87c349113ed6512f701ef101fc295f.zip
chromium_src-2fcd9d2dbe87c349113ed6512f701ef101fc295f.tar.gz
chromium_src-2fcd9d2dbe87c349113ed6512f701ef101fc295f.tar.bz2
Shrinks the launcher down to 48 pixels high, changes chromium image
appropriately, and gets browser window entry to match mocks. For aura_shell I'm randomly adding 3 images to test that it works. BUG=97262 TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8274019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/aura/chromium-32.pngbin0 -> 1180 bytes
-rw-r--r--ui/resources/aura/chromium-48.pngbin1790 -> 0 bytes
-rw-r--r--ui/resources/ui_resources.grd2
3 files changed, 1 insertions, 1 deletions
diff --git a/ui/resources/aura/chromium-32.png b/ui/resources/aura/chromium-32.png
new file mode 100644
index 0000000..5e3adba
--- /dev/null
+++ b/ui/resources/aura/chromium-32.png
Binary files differ
diff --git a/ui/resources/aura/chromium-48.png b/ui/resources/aura/chromium-48.png
deleted file mode 100644
index 9085a79..0000000
--- a/ui/resources/aura/chromium-48.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index dcb3a99..ab8899e 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -116,7 +116,7 @@
<!-- Images only used by Aura. -->
<if expr="pp_ifdef('use_aura')">
- <include name="IDR_AURA_LAUNCHER_ICON_CHROME" file="aura/chromium-48.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_ICON_CHROME" file="aura/chromium-32.png" type="BINDATA" />
<include name="IDR_AURA_LAUNCHER_TABBED_BROWSER" file="aura/browser_instance.png" type="BINDATA" />
<include name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="aura/applist.png" type="BINDATA" />
<include name="IDR_AURA_STATUS_MOCK" file="aura/statusbar.png" type="BINDATA" />