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

Side by Side Diff: content/renderer/pepper/pepper_device_enumeration_event_handler.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_PEPPER_PEPPER_DEVICE_ENUMERATION_EVENT_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_EVENT_HANDLER_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_EVENT_HANDLER_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_EVENT_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 16 matching lines...) Expand all
27 int RegisterOpenDeviceCallback( 27 int RegisterOpenDeviceCallback(
28 const PepperPluginDelegateImpl::OpenDeviceCallback& callback); 28 const PepperPluginDelegateImpl::OpenDeviceCallback& callback);
29 29
30 // MediaStreamDispatcherEventHandler implementation. 30 // MediaStreamDispatcherEventHandler implementation.
31 virtual void OnStreamGenerated( 31 virtual void OnStreamGenerated(
32 int request_id, 32 int request_id,
33 const std::string& label, 33 const std::string& label,
34 const media_stream::StreamDeviceInfoArray& audio_device_array, 34 const media_stream::StreamDeviceInfoArray& audio_device_array,
35 const media_stream::StreamDeviceInfoArray& video_device_array) OVERRIDE; 35 const media_stream::StreamDeviceInfoArray& video_device_array) OVERRIDE;
36 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE; 36 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE;
37 virtual void OnVideoDeviceFailed(const std::string& label,
38 int index) OVERRIDE;
39 virtual void OnAudioDeviceFailed(const std::string& label,
40 int index) OVERRIDE;
41 virtual void OnDevicesEnumerated( 37 virtual void OnDevicesEnumerated(
42 int request_id, 38 int request_id,
43 const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE; 39 const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE;
44 virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE; 40 virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE;
45 virtual void OnDeviceOpened( 41 virtual void OnDeviceOpened(
46 int request_id, 42 int request_id,
47 const std::string& label, 43 const std::string& label,
48 const media_stream::StreamDeviceInfo& device_info) OVERRIDE; 44 const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
49 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE; 45 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
50 46
(...skipping 23 matching lines...) Expand all
74 typedef std::map<int, PepperPluginDelegateImpl::OpenDeviceCallback> 70 typedef std::map<int, PepperPluginDelegateImpl::OpenDeviceCallback>
75 OpenCallbackMap; 71 OpenCallbackMap;
76 OpenCallbackMap open_callbacks_; 72 OpenCallbackMap open_callbacks_;
77 73
78 DISALLOW_COPY_AND_ASSIGN(PepperDeviceEnumerationEventHandler); 74 DISALLOW_COPY_AND_ASSIGN(PepperDeviceEnumerationEventHandler);
79 }; 75 };
80 76
81 } // namespace content 77 } // namespace content
82 78
83 #endif // CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_EVENT_HANDLER_H_ 79 #endif // CONTENT_RENDERER_PEPPER_PEPPER_DEVICE_ENUMERATION_EVENT_HANDLER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/pepper/pepper_device_enumeration_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698