Index: chrome/browser/ui/content_settings/content_setting_media_menu_model.cc |
diff --git a/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc b/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc |
index 98b0cabbdf1f8c3d3a19f898f772a4a2e2f51523..7e6453e7ed2c3cebec18a595abe60d469de678f6 100644 |
--- a/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc |
+++ b/chrome/browser/ui/content_settings/content_setting_media_menu_model.cc |
@@ -7,6 +7,7 @@ |
#include "base/strings/utf_string_conversions.h" |
#include "chrome/browser/media/media_capture_devices_dispatcher.h" |
#include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" |
+#include "content/public/browser/media_capture_devices.h" |
ContentSettingMediaMenuModel::ContentSettingMediaMenuModel( |
content::MediaStreamType type, |
@@ -20,12 +21,12 @@ ContentSettingMediaMenuModel::ContentSettingMediaMenuModel( |
type_ == content::MEDIA_DEVICE_VIDEO_CAPTURE); |
DCHECK_EQ(CONTENT_SETTINGS_TYPE_MEDIASTREAM, |
media_bubble_model_->content_type()); |
- MediaCaptureDevicesDispatcher* dispatcher = |
- MediaCaptureDevicesDispatcher::GetInstance(); |
+ content::MediaCaptureDevices* media_capture_devices = |
+ content::MediaCaptureDevices::GetInstance(); |
const content::MediaStreamDevices& devices = |
(type_ == content::MEDIA_DEVICE_AUDIO_CAPTURE) ? |
- dispatcher->GetAudioCaptureDevices() : |
- dispatcher->GetVideoCaptureDevices(); |
+ media_capture_devices->GetAudioCaptureDevices() : |
+ media_capture_devices->GetVideoCaptureDevices(); |
for (size_t i = 0; i < devices.size(); ++i) { |
commands_.insert(std::make_pair(commands_.size(), devices[i])); |