summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormacourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-24 15:55:34 +0000
committermacourteau@chromium.org <macourteau@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-24 15:55:34 +0000
commit794d5bd74291b18cf8055d3b3a84a300096fb0a0 (patch)
treeb32a2bab25f0118ef4b852903d484b8f184d0aa7 /chrome
parent4e773a8f30fcba14e3d86e856c0b140726ba65e3 (diff)
downloadchromium_src-794d5bd74291b18cf8055d3b3a84a300096fb0a0.zip
chromium_src-794d5bd74291b18cf8055d3b3a84a300096fb0a0.tar.gz
chromium_src-794d5bd74291b18cf8055d3b3a84a300096fb0a0.tar.bz2
Removing obsolete icons, and adding entries in the GRD files for the new icons.
BUG=105115 TEST=No user visible changes. Review URL: http://codereview.chromium.org/8639003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/theme/infobar_media_stream.pngbin650 -> 0 bytes
-rw-r--r--chrome/app/theme/large_infobar_media_stream.pngbin1546 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources_large.grd3
-rw-r--r--chrome/app/theme/theme_resources_standard.grd3
4 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/theme/infobar_media_stream.png b/chrome/app/theme/infobar_media_stream.png
deleted file mode 100644
index 485b361..0000000
--- a/chrome/app/theme/infobar_media_stream.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/large_infobar_media_stream.png b/chrome/app/theme/large_infobar_media_stream.png
deleted file mode 100644
index eae17b3..0000000
--- a/chrome/app/theme/large_infobar_media_stream.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources_large.grd b/chrome/app/theme/theme_resources_large.grd
index efd3542..602db92 100644
--- a/chrome/app/theme/theme_resources_large.grd
+++ b/chrome/app/theme/theme_resources_large.grd
@@ -68,7 +68,8 @@
<include name="IDR_INFOBAR_AUTOLOGIN" file="large_infobar_autologin.png" type="BINDATA" />
<include name="IDR_INFOBAR_COOKIE" file="large_infobar_cookie.png" type="BINDATA" />
<include name="IDR_INFOBAR_INCOMPLETE" file="large_infobar_incomplete.png" type="BINDATA" />
- <include name="IDR_INFOBAR_MEDIA_STREAM" file="large_infobar_media_stream.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="large_infobar_camera.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="large_infobar_microphone.png" type="BINDATA" />
<include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="large_infobar_multiple_downloads.png" type="BINDATA" />
<include name="IDR_INFOBAR_PLUGIN_CRASHED" file="large_infobar_plugin_crashed.png" type="BINDATA" />
<include name="IDR_INFOBAR_PLUGIN_INSTALL" file="large_infobar_plugin.png" type="BINDATA" />
diff --git a/chrome/app/theme/theme_resources_standard.grd b/chrome/app/theme/theme_resources_standard.grd
index 0c5592f..103ecb9 100644
--- a/chrome/app/theme/theme_resources_standard.grd
+++ b/chrome/app/theme/theme_resources_standard.grd
@@ -71,7 +71,8 @@
<include name="IDR_INFOBAR_AUTOLOGIN" file="infobar_autologin.png" type="BINDATA" />
<include name="IDR_INFOBAR_COOKIE" file="infobar_cookie.png" type="BINDATA" />
<include name="IDR_INFOBAR_INCOMPLETE" file="infobar_incomplete.png" type="BINDATA" />
- <include name="IDR_INFOBAR_MEDIA_STREAM" file="infobar_media_stream.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="infobar_camera.png" type="BINDATA" />
+ <include name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="infobar_microphone.png" type="BINDATA" />
<include name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" type="BINDATA" />
<include name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" type="BINDATA" />
<include name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" type="BINDATA" />