| Index: content/browser/renderer_host/media/media_stream_manager.h
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h
|
| index 2d0a56f192fa656e46d739d8ba02b981ad3b45c5..e437a8286670c5867862bd6b614623de51a2097a 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.h
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.h
|
| @@ -128,13 +128,15 @@ class CONTENT_EXPORT MediaStreamManager
|
| // and video devices and also start monitoring device changes, such as
|
| // plug/unplug. The new device lists will be delivered via media observer to
|
| // MediaCaptureDevicesDispatcher.
|
| + // If |have_permission| is false, we remove the device label from the result.
|
| virtual std::string EnumerateDevices(MediaStreamRequester* requester,
|
| int render_process_id,
|
| int render_view_id,
|
| const ResourceContext::SaltCallback& sc,
|
| int page_request_id,
|
| MediaStreamType type,
|
| - const GURL& security_origin);
|
| + const GURL& security_origin,
|
| + bool have_permission);
|
|
|
| // Open a device identified by |device_id|. |type| must be either
|
| // MEDIA_DEVICE_AUDIO_CAPTURE or MEDIA_DEVICE_VIDEO_CAPTURE.
|
|
|