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

Side by Side Diff: content/common/media/media_stream_options.h

Issue 10928043: Media Related changes for TabCapture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments, fixes, make tab capture skip approval. Created 8 years, 2 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 | Annotate | Revision Log
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_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 5 #ifndef CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 6 #define CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "content/common/content_export.h" 11 #include "content/common/content_export.h"
12 #include "content/public/common/media_stream_request.h" 12 #include "content/public/common/media_stream_request.h"
13 13
14 namespace media_stream { 14 namespace media_stream {
15 15
16 // MediaStreamConstraint keys for constraints that are passed to getUserMedia.
17 CONTENT_EXPORT extern const char kMediaStreamSource[];
18 CONTENT_EXPORT extern const char kMediaStreamSourceId[];
19
16 typedef content::MediaStreamDeviceType MediaStreamType; 20 typedef content::MediaStreamDeviceType MediaStreamType;
17 21
18 // StreamOptions is a Chromium representation of WebKit's 22 // StreamOptions is a Chromium representation of WebKit's
19 // WebUserMediaRequest Options. It describes the components 23 // WebUserMediaRequest Options. It describes the components
20 // in a request for a new media stream. 24 // in a request for a new media stream.
21 struct CONTENT_EXPORT StreamOptions { 25 struct CONTENT_EXPORT StreamOptions {
22 StreamOptions(); 26 StreamOptions();
23 // TODO(miu): Remove the 2-bools ctor in later clean-up CL. 27 // TODO(miu): Remove the 2-bools ctor in later clean-up CL.
24 StreamOptions(bool user_audio, bool user_video); 28 StreamOptions(bool user_audio, bool user_video);
25 StreamOptions(MediaStreamType audio_type, MediaStreamType video_type); 29 StreamOptions(MediaStreamType audio_type, MediaStreamType video_type);
(...skipping 28 matching lines...) Expand all
54 bool in_use; 58 bool in_use;
55 // Id for this capture session. Unique for all sessions of the same type. 59 // Id for this capture session. Unique for all sessions of the same type.
56 int session_id; 60 int session_id;
57 }; 61 };
58 62
59 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; 63 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
60 64
61 } // namespace media_stream 65 } // namespace media_stream
62 66
63 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 67 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698