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

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

Issue 7217018: Follow up patch on issue 7192007, containing mainly style fixes. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 namespace media_stream { 11 namespace media_stream {
12 12
13 // StreamOptions is a Chromium representation of WebKits 13 // StreamOptions is a Chromium representation of WebKit's
14 // WebGenerateStreamOptionFlags. It describes the components in a request for a 14 // WebGenerateStreamOptionFlags. It describes the components in a request for a
15 // new media stream. 15 // new media stream.
16 struct StreamOptions { 16 struct StreamOptions {
17 enum VideoOption { 17 enum VideoOption {
18 kNoCamera = 0, 18 kNoCamera = 0,
19 kFacingUser, 19 kFacingUser,
20 kFacingEnvironment, 20 kFacingEnvironment,
21 kFacingBoth 21 kFacingBoth
22 }; 22 };
23 23
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 bool in_use; 60 bool in_use;
61 // Id for this capture session. Unique for all sessions of the same type. 61 // Id for this capture session. Unique for all sessions of the same type.
62 int session_id; 62 int session_id;
63 }; 63 };
64 64
65 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray; 65 typedef std::vector<StreamDeviceInfo> StreamDeviceInfoArray;
66 66
67 } // namespace media_stream 67 } // namespace media_stream
68 68
69 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_ 69 #endif // CONTENT_COMMON_MEDIA_MEDIA_STREAM_OPTIONS_H_
OLDNEW
« no previous file with comments | « content/browser/renderer_host/media/video_capture_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698