summaryrefslogtreecommitdiffstats
path: root/ui/resources
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-28 21:12:43 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-28 21:12:43 +0000
commitbe149a3f00285713d18efe9c0fbe8d95b8b343a7 (patch)
tree70638e19d017e78b0a9654db5460e0443c2fa235 /ui/resources
parentf15841fb802ccfd27e9fd914734e38f64e6b880d (diff)
downloadchromium_src-be149a3f00285713d18efe9c0fbe8d95b8b343a7.zip
chromium_src-be149a3f00285713d18efe9c0fbe8d95b8b343a7.tar.gz
chromium_src-be149a3f00285713d18efe9c0fbe8d95b8b343a7.tar.bz2
Changes around the launcher so that it only shows the most recently
used icon, and the icon has a couple of different states indicating how many tabs are there. BUG=none TEST=none R=ben@chromium.org Review URL: http://codereview.chromium.org/8418006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107794 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/resources')
-rw-r--r--ui/resources/aura/browser_instance.pngbin1446 -> 0 bytes
-rw-r--r--ui/resources/aura/browser_instance_1.pngbin0 -> 1468 bytes
-rw-r--r--ui/resources/aura/browser_instance_2.pngbin0 -> 1568 bytes
-rw-r--r--ui/resources/aura/browser_instance_3.pngbin0 -> 1630 bytes
-rw-r--r--ui/resources/ui_resources.grd4
5 files changed, 3 insertions, 1 deletions
diff --git a/ui/resources/aura/browser_instance.png b/ui/resources/aura/browser_instance.png
deleted file mode 100644
index d279362..0000000
--- a/ui/resources/aura/browser_instance.png
+++ /dev/null
Binary files differ
diff --git a/ui/resources/aura/browser_instance_1.png b/ui/resources/aura/browser_instance_1.png
new file mode 100644
index 0000000..2d4a1c4
--- /dev/null
+++ b/ui/resources/aura/browser_instance_1.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_2.png b/ui/resources/aura/browser_instance_2.png
new file mode 100644
index 0000000..f766f1e
--- /dev/null
+++ b/ui/resources/aura/browser_instance_2.png
Binary files differ
diff --git a/ui/resources/aura/browser_instance_3.png b/ui/resources/aura/browser_instance_3.png
new file mode 100644
index 0000000..92be1c3
--- /dev/null
+++ b/ui/resources/aura/browser_instance_3.png
Binary files differ
diff --git a/ui/resources/ui_resources.grd b/ui/resources/ui_resources.grd
index ab8899e..a8c5916 100644
--- a/ui/resources/ui_resources.grd
+++ b/ui/resources/ui_resources.grd
@@ -117,7 +117,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_TABBED_BROWSER" file="aura/browser_instance.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_2" file="aura/browser_instance_2.png" type="BINDATA" />
+ <include name="IDR_AURA_LAUNCHER_TABBED_BROWSER_3" file="aura/browser_instance_3.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" />
<include name="IDR_AURA_WALLPAPER" file="aura/damask.png" type="BINDATA" />