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

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 8525018: switch to DVLOG from VLOG, and move struct definition to cc file (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/media_stream_manager.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_manager.cc (revision 109546)
+++ content/browser/renderer_host/media/media_stream_manager.cc (working copy)
@@ -49,6 +49,37 @@
return false;
}
+struct MediaStreamManager::DeviceRequest {
+ DeviceRequest()
+ : requester(NULL),
+ state(kNumMediaStreamTypes, kNotRequested) {
+ options.audio = false;
+ options.video_option = StreamOptions::kNoCamera;
+ }
+ DeviceRequest(
+ MediaStreamRequester* requester, const StreamOptions& request_options)
scherkus (not reviewing) 2011/11/11 01:44:43 nit: I'd move the args to previous line then align
wjia(left Chromium) 2011/11/11 01:51:00 Done.
+ : requester(requester),
+ options(request_options),
+ state(kNumMediaStreamTypes, kNotRequested) {
+ DCHECK(requester);
+ }
+ ~DeviceRequest() {}
+
+ enum RequestState {
+ kNotRequested = 0,
+ kRequested,
+ kOpening,
+ kDone,
+ kError
+ };
+
+ MediaStreamRequester* requester;
+ StreamOptions options;
+ std::vector<RequestState> state;
+ StreamDeviceInfoArray audio_devices;
+ StreamDeviceInfoArray video_devices;
+};
+
MediaStreamManager::MediaStreamManager()
: ALLOW_THIS_IN_INITIALIZER_LIST(
device_settings_(new MediaStreamDeviceSettings(this))),
@@ -413,21 +444,4 @@
return NULL;
}
-MediaStreamManager::DeviceRequest::DeviceRequest()
- : requester(NULL),
- state(kNumMediaStreamTypes, kNotRequested) {
- options.audio = false;
- options.video_option = StreamOptions::kNoCamera;
-}
-
-MediaStreamManager::DeviceRequest::DeviceRequest(
- MediaStreamRequester* requester, const StreamOptions& request_options)
- : requester(requester),
- options(request_options),
- state(kNumMediaStreamTypes, kNotRequested) {
- DCHECK(requester);
-}
-
-MediaStreamManager::DeviceRequest::~DeviceRequest() {}
-
} // namespace media_stream
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.h ('k') | content/renderer/media/media_stream_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698