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

Side by Side Diff: content/renderer/media/media_stream_impl.h

Issue 11146008: remove VideoDeviceError and AudioDeviceError for media stream. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 const GURL& url, 76 const GURL& url,
77 media::MessageLoopFactory* message_loop_factory) OVERRIDE; 77 media::MessageLoopFactory* message_loop_factory) OVERRIDE;
78 78
79 // MediaStreamDispatcherEventHandler implementation. 79 // MediaStreamDispatcherEventHandler implementation.
80 virtual void OnStreamGenerated( 80 virtual void OnStreamGenerated(
81 int request_id, 81 int request_id,
82 const std::string& label, 82 const std::string& label,
83 const media_stream::StreamDeviceInfoArray& audio_array, 83 const media_stream::StreamDeviceInfoArray& audio_array,
84 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE; 84 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE;
85 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE; 85 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE;
86 virtual void OnVideoDeviceFailed(
87 const std::string& label,
88 int index) OVERRIDE;
89 virtual void OnAudioDeviceFailed(
90 const std::string& label,
91 int index) OVERRIDE;
92 virtual void OnDevicesEnumerated( 86 virtual void OnDevicesEnumerated(
93 int request_id, 87 int request_id,
94 const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE; 88 const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE;
95 virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE; 89 virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE;
96 virtual void OnDeviceOpened( 90 virtual void OnDeviceOpened(
97 int request_id, 91 int request_id,
98 const std::string& label, 92 const std::string& label,
99 const media_stream::StreamDeviceInfo& device_info) OVERRIDE; 93 const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
100 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE; 94 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
101 95
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 155
162 scoped_refptr<VideoCaptureImplManager> vc_manager_; 156 scoped_refptr<VideoCaptureImplManager> vc_manager_;
163 157
164 MediaRequestMap user_media_requests_; 158 MediaRequestMap user_media_requests_;
165 LocalNativeStreamMap local_media_streams_; 159 LocalNativeStreamMap local_media_streams_;
166 160
167 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 161 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
168 }; 162 };
169 163
170 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 164 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698