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

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

Issue 649543002: Replacing MEDIA_LOOPBACK_AUDIO_CAPTURE with MEDIA_DESKTOP_AUDIO_CAPTURE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase the patchset Created 6 years, 1 month 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
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 <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 16 matching lines...) Expand all
27 MEDIA_DEVICE_VIDEO_CAPTURE, 27 MEDIA_DEVICE_VIDEO_CAPTURE,
28 28
29 // Mirroring of a browser tab. 29 // Mirroring of a browser tab.
30 MEDIA_TAB_AUDIO_CAPTURE, 30 MEDIA_TAB_AUDIO_CAPTURE,
31 MEDIA_TAB_VIDEO_CAPTURE, 31 MEDIA_TAB_VIDEO_CAPTURE,
32 32
33 // Desktop media sources. 33 // Desktop media sources.
34 MEDIA_DESKTOP_VIDEO_CAPTURE, 34 MEDIA_DESKTOP_VIDEO_CAPTURE,
35 35
36 // Capture system audio (post-mix loopback stream). 36 // Capture system audio (post-mix loopback stream).
37 // 37 MEDIA_DESKTOP_AUDIO_CAPTURE,
38 // TODO(sergeyu): Replace with MEDIA_DESKTOP_AUDIO_CAPTURE.
39 MEDIA_LOOPBACK_AUDIO_CAPTURE,
40 38
41 // This is used for enumerating audio output devices. 39 // This is used for enumerating audio output devices.
42 // TODO(grunell): Output isn't really a part of media streams. Device 40 // TODO(grunell): Output isn't really a part of media streams. Device
43 // enumeration should be decoupled from media streams and related code. 41 // enumeration should be decoupled from media streams and related code.
44 MEDIA_DEVICE_AUDIO_OUTPUT, 42 MEDIA_DEVICE_AUDIO_OUTPUT,
45 43
46 NUM_MEDIA_TYPES 44 NUM_MEDIA_TYPES
47 }; 45 };
48 46
49 // Types of media stream requests that can be made to the media controller. 47 // Types of media stream requests that can be made to the media controller.
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 259
262 // Callback used return results of media access requests. 260 // Callback used return results of media access requests.
263 typedef base::Callback<void( 261 typedef base::Callback<void(
264 const MediaStreamDevices& devices, 262 const MediaStreamDevices& devices,
265 content::MediaStreamRequestResult result, 263 content::MediaStreamRequestResult result,
266 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback; 264 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
267 265
268 } // namespace content 266 } // namespace content
269 267
270 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 268 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/public/common/media_stream_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698