Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2241)

Unified Diff: chrome/browser/media/media_stream_capture_indicator.cc

Issue 14318005: Allow media stream to display system tray icon on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_stream_capture_indicator.cc
===================================================================
--- chrome/browser/media/media_stream_capture_indicator.cc (revision 194976)
+++ chrome/browser/media/media_stream_capture_indicator.cc (working copy)
@@ -440,10 +440,13 @@
close_callback = usage.StopScreenCaptureCallback();
}
- // Audio/video icon is shown only for extensions. For regular tabs, we show
- // an indicator in the tab icon.
- if (GetExtension(web_contents) &&
- (usage.IsCapturingAudio() || usage.IsCapturingVideo())) {
+ // Audio/video icon is shown only for extensions or on Android.
+ // For regular tabs on desktop, we show an indicator in the tab icon.
+ if ((usage.IsCapturingAudio() || usage.IsCapturingVideo())
+#if !defined(OS_ANDROID)
+ && GetExtension(web_contents)
+#endif
+ ) {
audio = audio || usage.IsCapturingAudio();
video = video || usage.IsCapturingVideo();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698