| OLD | NEW |
| 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/media/user_media_client_impl.h" | 5 #include "content/renderer/media/user_media_client_impl.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 587 *webkit_source = *existing_source; | 587 *webkit_source = *existing_source; |
| 588 DVLOG(1) << "Source already exist. Reusing source with id " | 588 DVLOG(1) << "Source already exist. Reusing source with id " |
| 589 << webkit_source->id().utf8(); | 589 << webkit_source->id().utf8(); |
| 590 return; | 590 return; |
| 591 } | 591 } |
| 592 | 592 |
| 593 webkit_source->initialize( | 593 webkit_source->initialize( |
| 594 base::UTF8ToUTF16(device.device.id), | 594 base::UTF8ToUTF16(device.device.id), |
| 595 type, | 595 type, |
| 596 base::UTF8ToUTF16(device.device.name), | 596 base::UTF8ToUTF16(device.device.name), |
| 597 false /* remote */, true /* readonly */); | 597 false /* remote */); |
| 598 | 598 |
| 599 DVLOG(1) << "Initialize source object :" | 599 DVLOG(1) << "Initialize source object :" |
| 600 << "id = " << webkit_source->id().utf8() | 600 << "id = " << webkit_source->id().utf8() |
| 601 << ", name = " << webkit_source->name().utf8(); | 601 << ", name = " << webkit_source->name().utf8(); |
| 602 | 602 |
| 603 if (type == blink::WebMediaStreamSource::TypeVideo) { | 603 if (type == blink::WebMediaStreamSource::TypeVideo) { |
| 604 webkit_source->setExtraData( | 604 webkit_source->setExtraData( |
| 605 CreateVideoSource( | 605 CreateVideoSource( |
| 606 device, | 606 device, |
| 607 base::Bind(&UserMediaClientImpl::OnLocalSourceStopped, | 607 base::Bind(&UserMediaClientImpl::OnLocalSourceStopped, |
| (...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1143 return; | 1143 return; |
| 1144 } | 1144 } |
| 1145 } | 1145 } |
| 1146 } | 1146 } |
| 1147 | 1147 |
| 1148 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const { | 1148 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const { |
| 1149 return !sources_waiting_for_callback_.empty(); | 1149 return !sources_waiting_for_callback_.empty(); |
| 1150 } | 1150 } |
| 1151 | 1151 |
| 1152 } // namespace content | 1152 } // namespace content |
| OLD | NEW |