chrome/app/theme/theme_resources.grd - Issue 10829189: Update the webrtc camera and microphone icons for windows, linux and mac.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/app/theme/theme_resources.grd

Issue 10829189: Update the webrtc camera and microphone icons for windows, linux and mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased again. Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/app/theme/default_200_percent/infobar_microphone.png ('k') | chrome/app/theme/touch_100_percent/infobar_camera.png » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/app/theme/theme_resources.grd

diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd

index f3f1eec7a9efaab157a60b5438642fb2f2669117..ff75e4540c0309eb29412d2b2c6fea54504680e7 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_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>