mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Renamed enum in MediaStreamDeviceRequest

Browse source
This commit is contained in:
Paul Betts 2016-03-07 22:38:48 -08:00
parent d204febecf
commit 18a75b5124
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/browser/devtools_manager_delegate.cc
View file

@ -55,7 +55,7 @@ class TCPServerSocketFactory
} }
std::string address_; std::string address_;
uint16 port_; uint16_t port_;
DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory); DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
}; };

6
brightray/browser/media/media_stream_devices_controller.cc
View file

@ -33,10 +33,10 @@ MediaStreamDevicesController::MediaStreamDevicesController(
// and microphone to avoid popping two infobars. // and microphone to avoid popping two infobars.
microphone_requested_( microphone_requested_(
request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE || request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE ||
request.request_type == content::MEDIA_OPEN_DEVICE), request.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY),
webcam_requested_( webcam_requested_(
request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE || request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE ||
request.request_type == content::MEDIA_OPEN_DEVICE) { request.request_type == content::MEDIA_OPEN_DEVICE_PEPPER_ONLY) {
} }
MediaStreamDevicesController::~MediaStreamDevicesController() { MediaStreamDevicesController::~MediaStreamDevicesController() {
@ -72,7 +72,7 @@ void MediaStreamDevicesController::Accept() {
content::MediaStreamDevices devices; content::MediaStreamDevices devices;
if (microphone_requested_ || webcam_requested_) { if (microphone_requested_ || webcam_requested_) {
switch (request_.request_type) { switch (request_.request_type) {
case content::MEDIA_OPEN_DEVICE: { case content::MEDIA_OPEN_DEVICE_PEPPER_ONLY: {
const content::MediaStreamDevice* device = NULL; const content::MediaStreamDevice* device = NULL;
// For open device request pick the desired device or fall back to the // For open device request pick the desired device or fall back to the
// first available of the given type. // first available of the given type.