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

Side by Side Diff: content/renderer/pepper/pepper_media_device_manager.h

Issue 633303002: Replace FINAL and OVERRIDE with their C++11 counterparts in content/renderer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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_MEDIA_DEVICE_MANAGER_H_ 5 #ifndef CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_DEVICE_MANAGER_H_
6 #define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_DEVICE_MANAGER_H_ 6 #define CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_DEVICE_MANAGER_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 12 matching lines...) Expand all
23 public RenderFrameObserverTracker<PepperMediaDeviceManager>, 23 public RenderFrameObserverTracker<PepperMediaDeviceManager>,
24 public base::SupportsWeakPtr<PepperMediaDeviceManager> { 24 public base::SupportsWeakPtr<PepperMediaDeviceManager> {
25 public: 25 public:
26 static PepperMediaDeviceManager* GetForRenderFrame(RenderFrame* render_frame); 26 static PepperMediaDeviceManager* GetForRenderFrame(RenderFrame* render_frame);
27 virtual ~PepperMediaDeviceManager(); 27 virtual ~PepperMediaDeviceManager();
28 28
29 // PepperDeviceEnumerationHostHelper::Delegate implementation: 29 // PepperDeviceEnumerationHostHelper::Delegate implementation:
30 virtual int EnumerateDevices(PP_DeviceType_Dev type, 30 virtual int EnumerateDevices(PP_DeviceType_Dev type,
31 const GURL& document_url, 31 const GURL& document_url,
32 const EnumerateDevicesCallback& callback) 32 const EnumerateDevicesCallback& callback)
33 OVERRIDE; 33 override;
34 virtual void StopEnumerateDevices(int request_id) OVERRIDE; 34 virtual void StopEnumerateDevices(int request_id) override;
35 35
36 typedef base::Callback<void(int /* request_id */, 36 typedef base::Callback<void(int /* request_id */,
37 bool /* succeeded */, 37 bool /* succeeded */,
38 const std::string& /* label */)> 38 const std::string& /* label */)>
39 OpenDeviceCallback; 39 OpenDeviceCallback;
40 40
41 // Opens the specified device. The request ID passed into the callback will be 41 // Opens the specified device. The request ID passed into the callback will be
42 // the same as the return value. If successful, the label passed into the 42 // the same as the return value. If successful, the label passed into the
43 // callback identifies a audio/video steam, which can be used to call 43 // callback identifies a audio/video steam, which can be used to call
44 // CloseDevice() and GetSesssionID(). 44 // CloseDevice() and GetSesssionID().
45 int OpenDevice(PP_DeviceType_Dev type, 45 int OpenDevice(PP_DeviceType_Dev type,
46 const std::string& device_id, 46 const std::string& device_id,
47 const GURL& document_url, 47 const GURL& document_url,
48 const OpenDeviceCallback& callback); 48 const OpenDeviceCallback& callback);
49 // Cancels an request to open device, using the request ID returned by 49 // Cancels an request to open device, using the request ID returned by
50 // OpenDevice(). It is guaranteed that the callback passed into OpenDevice() 50 // OpenDevice(). It is guaranteed that the callback passed into OpenDevice()
51 // won't be called afterwards. 51 // won't be called afterwards.
52 void CancelOpenDevice(int request_id); 52 void CancelOpenDevice(int request_id);
53 void CloseDevice(const std::string& label); 53 void CloseDevice(const std::string& label);
54 // Gets audio/video session ID given a label. 54 // Gets audio/video session ID given a label.
55 int GetSessionID(PP_DeviceType_Dev type, const std::string& label); 55 int GetSessionID(PP_DeviceType_Dev type, const std::string& label);
56 56
57 // MediaStreamDispatcherEventHandler implementation. 57 // MediaStreamDispatcherEventHandler implementation.
58 virtual void OnStreamGenerated( 58 virtual void OnStreamGenerated(
59 int request_id, 59 int request_id,
60 const std::string& label, 60 const std::string& label,
61 const StreamDeviceInfoArray& audio_device_array, 61 const StreamDeviceInfoArray& audio_device_array,
62 const StreamDeviceInfoArray& video_device_array) OVERRIDE; 62 const StreamDeviceInfoArray& video_device_array) override;
63 virtual void OnStreamGenerationFailed( 63 virtual void OnStreamGenerationFailed(
64 int request_id, 64 int request_id,
65 content::MediaStreamRequestResult result) OVERRIDE; 65 content::MediaStreamRequestResult result) override;
66 virtual void OnDeviceStopped(const std::string& label, 66 virtual void OnDeviceStopped(const std::string& label,
67 const StreamDeviceInfo& device_info) OVERRIDE; 67 const StreamDeviceInfo& device_info) override;
68 virtual void OnDevicesEnumerated(int request_id, 68 virtual void OnDevicesEnumerated(int request_id,
69 const StreamDeviceInfoArray& device_array) 69 const StreamDeviceInfoArray& device_array)
70 OVERRIDE; 70 override;
71 virtual void OnDeviceOpened(int request_id, 71 virtual void OnDeviceOpened(int request_id,
72 const std::string& label, 72 const std::string& label,
73 const StreamDeviceInfo& device_info) OVERRIDE; 73 const StreamDeviceInfo& device_info) override;
74 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE; 74 virtual void OnDeviceOpenFailed(int request_id) override;
75 75
76 // Stream type conversion. 76 // Stream type conversion.
77 static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type); 77 static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type);
78 static PP_DeviceType_Dev FromMediaStreamType(MediaStreamType type); 78 static PP_DeviceType_Dev FromMediaStreamType(MediaStreamType type);
79 79
80 private: 80 private:
81 explicit PepperMediaDeviceManager(RenderFrame* render_frame); 81 explicit PepperMediaDeviceManager(RenderFrame* render_frame);
82 82
83 // Called by StopEnumerateDevices() after returing to the event loop, to avoid 83 // Called by StopEnumerateDevices() after returing to the event loop, to avoid
84 // a reentrancy problem. 84 // a reentrancy problem.
(...skipping 13 matching lines...) Expand all
98 98
99 typedef std::map<int, OpenDeviceCallback> OpenCallbackMap; 99 typedef std::map<int, OpenDeviceCallback> OpenCallbackMap;
100 OpenCallbackMap open_callbacks_; 100 OpenCallbackMap open_callbacks_;
101 101
102 DISALLOW_COPY_AND_ASSIGN(PepperMediaDeviceManager); 102 DISALLOW_COPY_AND_ASSIGN(PepperMediaDeviceManager);
103 }; 103 };
104 104
105 } // namespace content 105 } // namespace content
106 106
107 #endif // CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_DEVICE_MANAGER_H_ 107 #endif // CONTENT_RENDERER_PEPPER_PEPPER_MEDIA_DEVICE_MANAGER_H_
OLDNEW
« no previous file with comments | « content/renderer/pepper/pepper_in_process_router.cc ('k') | content/renderer/pepper/pepper_media_stream_audio_track_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698