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

Side by Side Diff: content/renderer/media/media_stream_dispatcher.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_DISPATCHER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 }; 130 };
131 131
132 // Messages from the browser. 132 // Messages from the browser.
133 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE; 133 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
134 void OnStreamGenerated( 134 void OnStreamGenerated(
135 int request_id, 135 int request_id,
136 const std::string& label, 136 const std::string& label,
137 const media_stream::StreamDeviceInfoArray& audio_array, 137 const media_stream::StreamDeviceInfoArray& audio_array,
138 const media_stream::StreamDeviceInfoArray& video_array); 138 const media_stream::StreamDeviceInfoArray& video_array);
139 void OnStreamGenerationFailed(int request_id); 139 void OnStreamGenerationFailed(int request_id);
140 void OnVideoDeviceFailed(const std::string& label, int index);
141 void OnAudioDeviceFailed(const std::string& label, int index);
142 void OnDevicesEnumerated( 140 void OnDevicesEnumerated(
143 int request_id, 141 int request_id,
144 const std::string& label, 142 const std::string& label,
145 const media_stream::StreamDeviceInfoArray& device_array); 143 const media_stream::StreamDeviceInfoArray& device_array);
146 void OnDevicesEnumerationFailed(int request_id); 144 void OnDevicesEnumerationFailed(int request_id);
147 void OnDeviceOpened( 145 void OnDeviceOpened(
148 int request_id, 146 int request_id,
149 const std::string& label, 147 const std::string& label,
150 const media_stream::StreamDeviceInfo& device_info); 148 const media_stream::StreamDeviceInfo& device_info);
151 void OnDeviceOpenFailed(int request_id); 149 void OnDeviceOpenFailed(int request_id);
(...skipping 15 matching lines...) Expand all
167 165
168 // List of calls made to GenerateStream/GenerateStreamForDevice that has not 166 // List of calls made to GenerateStream/GenerateStreamForDevice that has not
169 // yet completed. 167 // yet completed.
170 typedef std::list<Request> RequestList; 168 typedef std::list<Request> RequestList;
171 RequestList requests_; 169 RequestList requests_;
172 170
173 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher); 171 DISALLOW_COPY_AND_ASSIGN(MediaStreamDispatcher);
174 }; 172 };
175 173
176 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_ 174 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_DISPATCHER_H_
OLDNEW
« no previous file with comments | « content/common/media/media_stream_messages.h ('k') | content/renderer/media/media_stream_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698