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

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

Issue 1939313003: Revert of Add support for device-change notifications to MediaStreamDispatcher (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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/macros.h" 10 #include "base/macros.h"
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 int request_id, 65 int request_id,
66 content::MediaStreamRequestResult result) override; 66 content::MediaStreamRequestResult result) override;
67 void OnDeviceStopped(const std::string& label, 67 void OnDeviceStopped(const std::string& label,
68 const StreamDeviceInfo& device_info) override; 68 const StreamDeviceInfo& device_info) override;
69 void OnDevicesEnumerated(int request_id, 69 void OnDevicesEnumerated(int request_id,
70 const StreamDeviceInfoArray& device_array) override; 70 const StreamDeviceInfoArray& device_array) override;
71 void OnDeviceOpened(int request_id, 71 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 void OnDeviceOpenFailed(int request_id) override; 74 void OnDeviceOpenFailed(int request_id) override;
75 void OnDevicesChanged() override;
76 75
77 // Stream type conversion. 76 // Stream type conversion.
78 static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type); 77 static MediaStreamType FromPepperDeviceType(PP_DeviceType_Dev type);
79 static PP_DeviceType_Dev FromMediaStreamType(MediaStreamType type); 78 static PP_DeviceType_Dev FromMediaStreamType(MediaStreamType type);
80 79
81 private: 80 private:
82 explicit PepperMediaDeviceManager(RenderFrame* render_frame); 81 explicit PepperMediaDeviceManager(RenderFrame* render_frame);
83 82
84 // Called by StopEnumerateDevices() after returing to the event loop, to avoid 83 // Called by StopEnumerateDevices() after returing to the event loop, to avoid
85 // a reentrancy problem. 84 // a reentrancy problem.
(...skipping 13 matching lines...) Expand all
99 98
100 typedef std::map<int, OpenDeviceCallback> OpenCallbackMap; 99 typedef std::map<int, OpenDeviceCallback> OpenCallbackMap;
101 OpenCallbackMap open_callbacks_; 100 OpenCallbackMap open_callbacks_;
102 101
103 DISALLOW_COPY_AND_ASSIGN(PepperMediaDeviceManager); 102 DISALLOW_COPY_AND_ASSIGN(PepperMediaDeviceManager);
104 }; 103 };
105 104
106 } // namespace content 105 } // namespace content
107 106
108 #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/media/user_media_client_impl.cc ('k') | content/renderer/pepper/pepper_media_device_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698