summaryrefslogtreecommitdiffstats
path: root/chrome/app/theme
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:12:50 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:12:50 +0000
commit58db2f88917448f794deeee45868137d9098339a (patch)
tree0aa9feba219c093223542830c3e9951aa8f63ec1 /chrome/app/theme
parent66814bb0eb9fd82cb6acd58ddc9292555bd98322 (diff)
downloadchromium_src-58db2f88917448f794deeee45868137d9098339a.zip
chromium_src-58db2f88917448f794deeee45868137d9098339a.tar.gz
chromium_src-58db2f88917448f794deeee45868137d9098339a.tar.bz2
Make the multiple download request dialog an infobar.
The icon is a placeholder until Glen makes a pretty one. BUG=24047 TEST=go to skypher.com/SkyLined/Repro/Chrome/carpet bombing/repro.html allow, deny, closing infobar, and closing tab all work as expected Review URL: http://codereview.chromium.org/275011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29006 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/theme')
-rw-r--r--chrome/app/theme/infobar_multiple_downloads.pngbin0 -> 1437 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd3
2 files changed, 2 insertions, 1 deletions
diff --git a/chrome/app/theme/infobar_multiple_downloads.png b/chrome/app/theme/infobar_multiple_downloads.png
new file mode 100644
index 0000000..c9cc37c
--- /dev/null
+++ b/chrome/app/theme/infobar_multiple_downloads.png
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index a444c21..339585f 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -228,6 +228,8 @@
<include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type="BINDATA" />
<include name="IDR_INFOBAR_QUESTION_MARK" file="infobar_questionmark.png" type="BINDATA" />
<include name="IDR_INFOBAR_THEME" file="infobar_theme.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" type="BINDATA" />
<include name="IDR_MENU_MARKER" file="menu_marker.png" type="BINDATA" />
<include name="IDR_FROZEN_TAB_ICON" file="frozen_tab.png" type="BINDATA" />
<include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" />
@@ -240,7 +242,6 @@
<include name="IDR_DEFAULT_THUMBNAIL" file="default_thumbnail.png" type="BINDATA" />
<include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" />
<include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" />
- <include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" type="BINDATA" />
<include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDATA" />
<include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" />
<include name="IDR_CLOSE_BAR" file="close_bar.png" type="BINDATA" />