Whitelist the Hotword extension.

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"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/tab_contents/tab_util.h"
+#include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/invalidate_type.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "extensions/common/extension.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ skipping 20 matching lines @@
     return NULL;
 
   ExtensionService* extension_service = profile->GetExtensionService();
   if (!extension_service)
     return NULL;
 
   return extension_service->extensions()->GetExtensionOrAppByURL(
       web_contents->GetURL());
 }
 
+#if !defined(OS_ANDROID)
+
+bool IsWhitelistedExtension(const extensions::Extension* extension) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+
+  static const char* kExtensionWhitelist[] = {

[no longer working on chromium, 2014/04/25 11:19:34]

nit, static const char* const ?

[tommi (sloooow) - chröme, 2014/04/25 14:53:50]

Done.

+    extension_misc::kHotwordExtensionId,
+  };
+
+  for (size_t i = 0; i < arraysize(kExtensionWhitelist); ++i) {
+    if (extension->id() == kExtensionWhitelist[i])
+      return true;
+  }
+
+  return false;
+}
+
+#endif  //  !defined(OS_ANDROID)

[no longer working on chromium, 2014/04/25 11:19:34]

nit, one empty space between // and !defined(OS_ANDROID)

[tommi (sloooow) - chröme, 2014/04/25 14:53:50]

Done.

+
 // Gets the security originator of the tab. It returns a string with no '/'
 // at the end to display in the UI.
 base::string16 GetSecurityOrigin(WebContents* web_contents) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!web_contents)
     return base::string16();
 
   std::string security_origin = web_contents->GetURL().GetOrigin().spec();
 
@@ skipping 328 matching lines @@
 
   bool audio = false;
   bool video = false;
   int command_id = IDC_MEDIA_CONTEXT_MEDIA_STREAM_CAPTURE_LIST_FIRST;
   command_targets_.clear();
 
   for (UsageMap::const_iterator iter = usage_map_.begin();
        iter != usage_map_.end(); ++iter) {
     // Check if any audio and video devices have been used.
     const WebContentsDeviceUsage& usage = *iter->second;
+    if (!usage.IsCapturingAudio() && !usage.IsCapturingVideo())
+      continue;
+
     WebContents* const web_contents = iter->first;
 
     // Audio/video icon is shown only for extensions or on Android.

[no longer working on chromium, 2014/04/25 11:19:34]

could you please update the comment to explain we do not show the icon for the
whitelisted extension(s) ?

[tommi (sloooow) - chröme, 2014/04/25 14:53:50]

Done.

     // 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)
+    const extensions::Extension* extension = GetExtension(web_contents);
+    if (!extension || IsWhitelistedExtension(extension))
+      continue;
 #endif
-        ) {
-      audio = audio || usage.IsCapturingAudio();
-      video = video || usage.IsCapturingVideo();
 
-      command_targets_.push_back(web_contents);
-      menu->AddItem(command_id, GetTitle(web_contents));
+    audio = audio || usage.IsCapturingAudio();
+    video = video || usage.IsCapturingVideo();
 
-      // If the menu item is not a label, enable it.
-      menu->SetCommandIdEnabled(command_id,
-                                command_id != IDC_MinimumLabelValue);
+    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;
-    }
+    // If the menu item is not a label, enable it.
+    menu->SetCommandIdEnabled(command_id,
+                              command_id != IDC_MinimumLabelValue);
+
+    // 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;
   }
 
   if (command_targets_.empty()) {
     MaybeDestroyStatusTrayIcon();
     return;
   }
 
   // The icon will take the ownership of the passed context menu.
   MaybeCreateStatusTrayIcon(audio, video);
   if (status_icon_) {
@@ skipping 16 matching lines @@
   } else if (audio && !video) {
     message_id = IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_AUDIO_ONLY;
     *image = *mic_image_;
   } else if (!audio && video) {
     message_id = IDS_MEDIA_STREAM_STATUS_TRAY_TEXT_VIDEO_ONLY;
     *image = *camera_image_;
   }
 
   *tool_tip = l10n_util::GetStringUTF16(message_id);
 }