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

Side by Side Diff: content/renderer/pepper/pepper_device_enumeration_event_handler.cc

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
« no previous file with comments | « content/renderer/pepper/pepper_device_enumeration_event_handler.h ('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) 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 #include "content/renderer/pepper/pepper_device_enumeration_event_handler.h" 5 #include "content/renderer/pepper/pepper_device_enumeration_event_handler.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "ppapi/shared_impl/ppb_device_ref_shared.h" 8 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
9 9
10 namespace content { 10 namespace content {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 int request_id, 48 int request_id,
49 const std::string& label, 49 const std::string& label,
50 const media_stream::StreamDeviceInfoArray& audio_device_array, 50 const media_stream::StreamDeviceInfoArray& audio_device_array,
51 const media_stream::StreamDeviceInfoArray& video_device_array) { 51 const media_stream::StreamDeviceInfoArray& video_device_array) {
52 } 52 }
53 53
54 void PepperDeviceEnumerationEventHandler::OnStreamGenerationFailed( 54 void PepperDeviceEnumerationEventHandler::OnStreamGenerationFailed(
55 int request_id) { 55 int request_id) {
56 } 56 }
57 57
58 void PepperDeviceEnumerationEventHandler::OnVideoDeviceFailed(
59 const std::string& label,
60 int index) {
61 }
62
63 void PepperDeviceEnumerationEventHandler::OnAudioDeviceFailed(
64 const std::string& label,
65 int index) {
66 }
67
68 void PepperDeviceEnumerationEventHandler::OnDevicesEnumerated( 58 void PepperDeviceEnumerationEventHandler::OnDevicesEnumerated(
69 int request_id, 59 int request_id,
70 const media_stream::StreamDeviceInfoArray& device_array) { 60 const media_stream::StreamDeviceInfoArray& device_array) {
71 NotifyDevicesEnumerated(request_id, true, device_array); 61 NotifyDevicesEnumerated(request_id, true, device_array);
72 } 62 }
73 63
74 void PepperDeviceEnumerationEventHandler::OnDevicesEnumerationFailed( 64 void PepperDeviceEnumerationEventHandler::OnDevicesEnumerationFailed(
75 int request_id) { 65 int request_id) {
76 NotifyDevicesEnumerated(request_id, false, 66 NotifyDevicesEnumerated(request_id, false,
77 media_stream::StreamDeviceInfoArray()); 67 media_stream::StreamDeviceInfoArray());
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 return; 147 return;
158 } 148 }
159 149
160 PepperPluginDelegateImpl::OpenDeviceCallback callback = iter->second; 150 PepperPluginDelegateImpl::OpenDeviceCallback callback = iter->second;
161 open_callbacks_.erase(iter); 151 open_callbacks_.erase(iter);
162 152
163 callback.Run(request_id, succeeded, label); 153 callback.Run(request_id, succeeded, label);
164 } 154 }
165 155
166 } // namespace content 156 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_device_enumeration_event_handler.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698