Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Side by Side Diff: content/public/common/media_stream_request.h

Issue 2350693002: Remove device enumeration, caching and monitoring from MediaStreamManager. (Closed)
Patch Set: latest hta@ comments Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/common/media/media_devices.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
(...skipping 20 matching lines...) Expand all
31 // Mirroring of a browser tab. 31 // Mirroring of a browser tab.
32 MEDIA_TAB_AUDIO_CAPTURE, 32 MEDIA_TAB_AUDIO_CAPTURE,
33 MEDIA_TAB_VIDEO_CAPTURE, 33 MEDIA_TAB_VIDEO_CAPTURE,
34 34
35 // Desktop media sources. 35 // Desktop media sources.
36 MEDIA_DESKTOP_VIDEO_CAPTURE, 36 MEDIA_DESKTOP_VIDEO_CAPTURE,
37 37
38 // Capture system audio (post-mix loopback stream). 38 // Capture system audio (post-mix loopback stream).
39 MEDIA_DESKTOP_AUDIO_CAPTURE, 39 MEDIA_DESKTOP_AUDIO_CAPTURE,
40 40
41 // This is used for enumerating audio output devices. 41 // TODO(guidou): This is used for device enumerations, but it is not a
42 // TODO(grunell): Output isn't really a part of media streams. Device 42 // media stream type. Remove when handling of renderer-generated enumeration
43 // enumeration should be decoupled from media streams and related code. 43 // requests is removed from MediaStreamManager. See http://crbug.com/648183.
44 MEDIA_DEVICE_AUDIO_OUTPUT, 44 MEDIA_DEVICE_AUDIO_OUTPUT,
45 45
46 NUM_MEDIA_TYPES 46 NUM_MEDIA_TYPES
47 }; 47 };
48 48
49 // Types of media stream requests that can be made to the media controller. 49 // Types of media stream requests that can be made to the media controller.
50 enum MediaStreamRequestType { 50 enum MediaStreamRequestType {
51 MEDIA_DEVICE_ACCESS = 0, 51 MEDIA_DEVICE_ACCESS = 0,
52 MEDIA_GENERATE_STREAM, 52 MEDIA_GENERATE_STREAM,
53 MEDIA_ENUMERATE_DEVICES, 53 MEDIA_ENUMERATE_DEVICES,
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 275
276 // Callback used return results of media access requests. 276 // Callback used return results of media access requests.
277 typedef base::Callback<void(const MediaStreamDevices& devices, 277 typedef base::Callback<void(const MediaStreamDevices& devices,
278 content::MediaStreamRequestResult result, 278 content::MediaStreamRequestResult result,
279 std::unique_ptr<MediaStreamUI> ui)> 279 std::unique_ptr<MediaStreamUI> ui)>
280 MediaResponseCallback; 280 MediaResponseCallback;
281 281
282 } // namespace content 282 } // namespace content
283 283
284 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 284 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW
« no previous file with comments | « content/common/media/media_devices.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698