summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/app/theme/default_100_percent/infobar_camera.pngbin290 -> 0 bytes
-rw-r--r--chrome/app/theme/default_100_percent/infobar_microphone.pngbin361 -> 0 bytes
-rw-r--r--chrome/app/theme/default_200_percent/infobar_camera.pngbin534 -> 0 bytes
-rw-r--r--chrome/app/theme/default_200_percent/infobar_microphone.pngbin716 -> 0 bytes
-rw-r--r--chrome/app/theme/theme_resources.grd10
-rw-r--r--chrome/app/theme/touch_100_percent/infobar_camera.pngbin512 -> 0 bytes
-rw-r--r--chrome/app/theme/touch_100_percent/infobar_microphone.pngbin723 -> 0 bytes
7 files changed, 8 insertions, 2 deletions
diff --git a/chrome/app/theme/default_100_percent/infobar_camera.png b/chrome/app/theme/default_100_percent/infobar_camera.png
deleted file mode 100644
index 4a04a6e..0000000
--- a/chrome/app/theme/default_100_percent/infobar_camera.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/default_100_percent/infobar_microphone.png b/chrome/app/theme/default_100_percent/infobar_microphone.png
deleted file mode 100644
index 081e363..0000000
--- a/chrome/app/theme/default_100_percent/infobar_microphone.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/default_200_percent/infobar_camera.png b/chrome/app/theme/default_200_percent/infobar_camera.png
deleted file mode 100644
index 86132d9..0000000
--- a/chrome/app/theme/default_200_percent/infobar_camera.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/default_200_percent/infobar_microphone.png b/chrome/app/theme/default_200_percent/infobar_microphone.png
deleted file mode 100644
index 4e2f9a3..0000000
--- a/chrome/app/theme/default_200_percent/infobar_microphone.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index f3f1eec..ff75e45 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -328,8 +328,14 @@
<structure type="chrome_scaled_image" name="IDR_INFOBAR_COOKIE" file="infobar_cookie.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_DESKTOP_NOTIFICATIONS" file="infobar_desktop_notifications.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_INCOMPLETE" file="infobar_incomplete.png" />
- <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="infobar_camera.png" />
- <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="infobar_microphone.png" />
+ <if expr="is_macosx">
+ <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="webrtc_macosx_webcam.png" />
+ <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="webrtc_macosx_mic.png" />
+ </if>
+ <if expr="not is_macosx">
+ <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_CAMERA" file="webrtc_webcam.png" />
+ <structure type="chrome_scaled_image" name="IDR_INFOBAR_MEDIA_STREAM_MIC" file="webrtc_mic.png" />
+ </if>
<structure type="chrome_scaled_image" name="IDR_INFOBAR_MULTIPLE_DOWNLOADS" file="infobar_multiple_downloads.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_CRASHED" file="infobar_plugin_crashed.png" />
<structure type="chrome_scaled_image" name="IDR_INFOBAR_PLUGIN_INSTALL" file="infobar_plugin.png" />
diff --git a/chrome/app/theme/touch_100_percent/infobar_camera.png b/chrome/app/theme/touch_100_percent/infobar_camera.png
deleted file mode 100644
index 56d4638..0000000
--- a/chrome/app/theme/touch_100_percent/infobar_camera.png
+++ /dev/null
Binary files differ
diff --git a/chrome/app/theme/touch_100_percent/infobar_microphone.png b/chrome/app/theme/touch_100_percent/infobar_microphone.png
deleted file mode 100644
index 4378be0..0000000
--- a/chrome/app/theme/touch_100_percent/infobar_microphone.png
+++ /dev/null
Binary files differ