Allow media stream to display system tray icon on Android.

chrome/browser/media/media_stream_capture_indicator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/media_stream_capture_indicator.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 422 matching lines @@
       // destroyed and are capturing audio or video.
       continue;
     }
 
     if (usage.IsCapturingScreen()) {
       DCHECK(!screen_capturer);
       screen_capturer = web_contents;
       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();
 
       command_targets_.push_back(web_contents);
       menu->AddItem(command_id, GetTitle(web_contents));
 
       // If reaching the maximum number, no more item will be added to the menu.
       if (command_id == IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_LAST)
         break;
       ++command_id;
@@ skipping 135 matching lines @@
   }
 
   UpdateNotificationUserInterface();
 }
 
 void MediaStreamCaptureIndicator::OnStopScreenCapture(
     const base::Closure& stop) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   stop.Run();
 }