Adding device selection menus to the content setting bubble

chrome/browser/ui/content_settings/content_setting_bubble_model.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/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/infobars/infobar_service.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
+#include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate.h"
 #include "chrome/browser/ui/collected_cookies_infobar_delegate.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/pref_names.h"
@@ skipping 24 matching lines @@
 int GetIdForContentType(const ContentSettingsTypeIdEntry* entries,
                         size_t num_entries,
                         ContentSettingsType type) {
   for (size_t i = 0; i < num_entries; ++i) {
     if (entries[i].type == type)
       return entries[i].id;
   }
   return 0;
 }
 
+const content::MediaStreamDevice& GetMediaDeviceById(
+    const std::string& device_id, const content::MediaStreamDevices& devices) {

[Peter Kasting, 2013/02/06 22:11:18]

Nit: One arg per line

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+  DCHECK(devices.size());

[Peter Kasting, 2013/02/06 22:11:18]

Nit: !empty()

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+  for (content::MediaStreamDevices::const_iterator it = devices.begin();
+       it != devices.end(); ++it) {
+    if (it->id == device_id)
+      return *(it);
+  }
+
+  // A device with the |device_id| was not found. It is likely that the device
+  // has been unplugged from the OS. Return the first device as the default
+  // device.
+  return *devices.begin();
+}
+
 }  // namespace
 
 ContentSettingTitleAndLinkModel::ContentSettingTitleAndLinkModel(
     Delegate* delegate,
     WebContents* web_contents,
     Profile* profile,
     ContentSettingsType content_type)
     : ContentSettingBubbleModel(web_contents, profile, content_type),
         delegate_(delegate) {
    // Notifications do not have a bubble.
@@ skipping 429 matching lines @@
                                        WebContents* web_contents,
                                        Profile* profile);
 
   virtual ~ContentSettingMediaStreamBubbleModel();
 
  private:
   // Sets the title of the bubble.
   void SetTitle();
   // Sets the data for the radio buttons of the bubble.
   void SetRadioGroup();
+  // Sets the data for the media menus of the bubble.
+  void SetMediaMenus();
   // Updates the camera and microphone setting with the passed |setting|.
   void UpdateSettings(ContentSetting setting);
+  // Updates the camera and microphone default device with the passed |type|
+  // and device.
+  void UpdateDefaultDeviceForType(content::MediaStreamType type,
+                                  const std::string& device);
 
   // ContentSettingBubbleModel implementation.
   virtual void OnRadioClicked(int radio_index) OVERRIDE;
+  virtual void OnMediaMenuClicked(content::MediaStreamType type,
+                                  const std::string& selected_device) OVERRIDE;
 
   // The index of the selected radio item.
   int selected_item_;
   // The content settings that are associated with the individual radio
   // buttons.
   ContentSetting radio_item_setting_[2];
 };
 
 ContentSettingMediaStreamBubbleModel::ContentSettingMediaStreamBubbleModel(
     Delegate* delegate,
     WebContents* web_contents,
     Profile* profile)
     : ContentSettingTitleAndLinkModel(
           delegate, web_contents, profile, CONTENT_SETTINGS_TYPE_MEDIASTREAM),
       selected_item_(0) {
+  DCHECK(profile);
   // Initialize the content settings associated with the individual radio
   // buttons.
   radio_item_setting_[0] = CONTENT_SETTING_ASK;
   radio_item_setting_[1] = CONTENT_SETTING_BLOCK;
 
   SetTitle();
   SetRadioGroup();
+  SetMediaMenus();
 }
 
 ContentSettingMediaStreamBubbleModel::~ContentSettingMediaStreamBubbleModel() {
   // Update the media settings if the radio button selection was changed.
   if (selected_item_ != bubble_content().radio_group.default_item)
     UpdateSettings(radio_item_setting_[selected_item_]);
+
+  for (MediaMenuMap::const_iterator it = bubble_content().media_menus.begin();
+       it != bubble_content().media_menus.end(); ++it) {
+    if (it->second.selected_device.id != it->second.default_device.id) {

[Peter Kasting, 2013/02/06 22:11:18]

Nit: {} not necessary

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+      UpdateDefaultDeviceForType(it->first, it->second.selected_device.id);
+    }
+  }
 }
 
 void ContentSettingMediaStreamBubbleModel::SetTitle() {
   TabSpecificContentSettings* content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   int title_id = IDS_MEDIASTREAM_BUBBLE_SECTION_ALLOWED;
   if (content_settings->IsContentBlocked(CONTENT_SETTINGS_TYPE_MEDIASTREAM))
     title_id = IDS_MEDIASTREAM_BUBBLE_SECTION_BLOCKED;
   set_title(l10n_util::GetStringUTF8(title_id));
 }
@@ skipping 59 matching lines @@
         ContentSettingsPattern::Wildcard();
     content_settings->SetContentSetting(
         primary_pattern, secondary_pattern,
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), setting);
     content_settings->SetContentSetting(
         primary_pattern, secondary_pattern,
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA, std::string(), setting);
   }
 }
 
+void ContentSettingMediaStreamBubbleModel::UpdateDefaultDeviceForType(
+    content::MediaStreamType type, const std::string& device) {

[Peter Kasting, 2013/02/06 22:11:18]

Nit: One arg per line

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+  PrefService* prefs = profile()->GetPrefs();
+  switch (type) {

[Peter Kasting, 2013/02/06 22:11:18]

Nit: Shorter:

  DCHECK((type == content::MEDIA_DEVICE_AUDIO_CAPTURE) ||
      (type == content::MEDIA_DEVICE_VIDEO_CAPTURE));
  prefs->SetString((type == content::MEDIA_DEVICE_AUDIO_CAPTURE) ?
      prefs::kDefaultAudioCaptureDevice : prefs::kDefaultVideoCaptureDevice,
      device);

You could also do this with ifs:

  if (type == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
    prefs->SetString(prefs::kDefaultAudioCaptureDevice, device);
  } else {
    DCHECK_EQ(content::MEDIA_DEVICE_VIDEO_CAPTURE, type);
    prefs->SetString(prefs::kDefaultVideoCaptureDevice, device);
  }

[no longer working on chromium, 2013/02/07 16:25:19]

Done with using the ifs.

+    case content::MEDIA_DEVICE_AUDIO_CAPTURE:
+      prefs->SetString(prefs::kDefaultAudioCaptureDevice, device);
+      break;
+    case content::MEDIA_DEVICE_VIDEO_CAPTURE:
+      prefs->SetString(prefs::kDefaultVideoCaptureDevice, device);
+      break;
+    default:
+      NOTREACHED();
+  }
+}
+
+void ContentSettingMediaStreamBubbleModel::SetMediaMenus() {
+  // Add microphone menu.
+  PrefService* prefs = profile()->GetPrefs();
+  MediaCaptureDevicesDispatcher* dispatcher =
+      MediaCaptureDevicesDispatcher::GetInstance();
+  const content::MediaStreamDevices& microphones =
+      dispatcher->GetAudioCaptureDevices();
+  MediaMenu mic_menu;
+  mic_menu.label = l10n_util::GetStringUTF8(IDS_MEDIA_SELECTED_MIC_LABEL);
+  if (microphones.size()) {

[Peter Kasting, 2013/02/06 22:11:18]

Nit: !empty() (2 places)

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+    std::string preferred_mic =
+        prefs->GetString(prefs::kDefaultAudioCaptureDevice);
+    mic_menu.default_device = GetMediaDeviceById(preferred_mic, microphones);
+    mic_menu.selected_device = mic_menu.default_device;
+  }
+  add_media_menu(content::MEDIA_DEVICE_AUDIO_CAPTURE, mic_menu);
+
+  // Add camera menu.
+  const content::MediaStreamDevices& cameras =
+      dispatcher->GetVideoCaptureDevices();
+  MediaMenu camera_menu;
+  camera_menu.label = l10n_util::GetStringUTF8(IDS_MEDIA_SELECTED_CAMERA_LABEL);
+  if (cameras.size()) {
+    std::string preferred_camera =
+        prefs->GetString(prefs::kDefaultVideoCaptureDevice);
+    camera_menu.default_device = GetMediaDeviceById(preferred_camera,
+                                                    cameras);
+    camera_menu.selected_device = camera_menu.default_device;
+  }
+  add_media_menu(content::MEDIA_DEVICE_VIDEO_CAPTURE, camera_menu);
+}
+
 void ContentSettingMediaStreamBubbleModel::OnRadioClicked(int radio_index) {
   selected_item_ = radio_index;
 }
 
+void ContentSettingMediaStreamBubbleModel::OnMediaMenuClicked(
+    content::MediaStreamType type, const std::string& selected_device_id) {
+  DCHECK(bubble_content().media_menus.find(type) !=

[Peter Kasting, 2013/02/06 22:11:18]

Nit: Use count() instead of find() (shorter)

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+      bubble_content().media_menus.end());
+  MediaCaptureDevicesDispatcher* dispatcher =
+      MediaCaptureDevicesDispatcher::GetInstance();
+  content::MediaStreamDevices devices;

[Peter Kasting, 2013/02/06 22:11:18]

Nit: I suggest using ?: to initialize this at its declaration point (add an
optional DCHECK above it if it makes you feel safer).

This prevents someone adding a future case that fails to initialize this, and is
shorter to boot.

[no longer working on chromium, 2013/02/07 16:25:19]

Done.

+  switch (type) {
+    case content::MEDIA_DEVICE_AUDIO_CAPTURE:
+      devices = dispatcher->GetAudioCaptureDevices();
+      break;
+    case content::MEDIA_DEVICE_VIDEO_CAPTURE:
+      devices = dispatcher->GetVideoCaptureDevices();
+      break;
+    default:
+      NOTREACHED();
+  }
+  set_selected_device(GetMediaDeviceById(selected_device_id, devices));
+}
+
 class ContentSettingDomainListBubbleModel
     : public ContentSettingTitleAndLinkModel {
  public:
   ContentSettingDomainListBubbleModel(Delegate* delegate,
                                       WebContents* web_contents,
                                       Profile* profile,
                                       ContentSettingsType content_type);
   virtual ~ContentSettingDomainListBubbleModel() {}
 
  private:
@@ skipping 324 matching lines @@
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     DCHECK_EQ(web_contents_,
               content::Source<WebContents>(source).ptr());
     web_contents_ = NULL;
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
     DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
     profile_ = NULL;
   }
 }