diff options
| author | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 22:49:06 +0000 |
|---|---|---|
| committer | wjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 22:49:06 +0000 |
| commit | 980b035bae457a33a1f1222216671dad2ca6704b (patch) | |
| tree | 2d1a206c462cda6a8f95d1c76e13149ba9e4fa52 /media | |
| parent | 2c533600620398ece774ac0f39cf32e73f231bf1 (diff) | |
| download | chromium_src-980b035bae457a33a1f1222216671dad2ca6704b.zip chromium_src-980b035bae457a33a1f1222216671dad2ca6704b.tar.gz chromium_src-980b035bae457a33a1f1222216671dad2ca6704b.tar.bz2 | |
revert CL 84847
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7005013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84883 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/video/capture/video_capture_types.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/media/video/capture/video_capture_types.h b/media/video/capture/video_capture_types.h index ee4e3a4..724f243 100644 --- a/media/video/capture/video_capture_types.h +++ b/media/video/capture/video_capture_types.h @@ -5,18 +5,21 @@ #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_ #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_ -#include "content/common/media_stream/media_stream_types.h" - namespace media { +// TODO(wjia): this type should be defined in a common place and +// shared with device manager. +typedef int VideoCaptureSessionId; + // Parameters for starting video capture and device information. struct VideoCaptureParams { int width; int height; int frame_per_second; - media_stream::MediaCaptureSessionId session_id; + VideoCaptureSessionId session_id; }; } // namespace media #endif // MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_ + |