| 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/media_stream_impl.h" | 5 #include "content/renderer/media/media_stream_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/hash.h" | 9 #include "base/hash.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 void MediaStreamImpl::OnDeviceOpenFailed(int request_id) { | 594 void MediaStreamImpl::OnDeviceOpenFailed(int request_id) { |
| 595 DVLOG(1) << "MediaStreamImpl::VideoDeviceOpenFailed(" | 595 DVLOG(1) << "MediaStreamImpl::VideoDeviceOpenFailed(" |
| 596 << request_id << ")"; | 596 << request_id << ")"; |
| 597 NOTIMPLEMENTED(); | 597 NOTIMPLEMENTED(); |
| 598 } | 598 } |
| 599 | 599 |
| 600 void MediaStreamImpl::GetUserMediaRequestSucceeded( | 600 void MediaStreamImpl::GetUserMediaRequestSucceeded( |
| 601 const blink::WebMediaStream& stream, | 601 const blink::WebMediaStream& stream, |
| 602 blink::WebUserMediaRequest* request_info) { | 602 blink::WebUserMediaRequest* request_info) { |
| 603 DVLOG(1) << "MediaStreamImpl::GetUserMediaRequestSucceeded"; | 603 DVLOG(1) << "MediaStreamImpl::GetUserMediaRequestSucceeded"; |
| 604 LogUserMediaRequestResult(MEDIA_DEVICE_OK); |
| 604 request_info->requestSucceeded(stream); | 605 request_info->requestSucceeded(stream); |
| 605 } | 606 } |
| 606 | 607 |
| 607 void MediaStreamImpl::GetUserMediaRequestFailed( | 608 void MediaStreamImpl::GetUserMediaRequestFailed( |
| 608 blink::WebUserMediaRequest* request_info, | 609 blink::WebUserMediaRequest* request_info, |
| 609 content::MediaStreamRequestResult result) { | 610 content::MediaStreamRequestResult result) { |
| 611 LogUserMediaRequestResult(result); |
| 610 switch (result) { | 612 switch (result) { |
| 611 case MEDIA_DEVICE_OK: | 613 case MEDIA_DEVICE_OK: |
| 612 NOTREACHED(); | 614 NOTREACHED(); |
| 613 break; | 615 break; |
| 614 case MEDIA_DEVICE_PERMISSION_DENIED: | 616 case MEDIA_DEVICE_PERMISSION_DENIED: |
| 615 request_info->requestDenied(); | 617 request_info->requestDenied(); |
| 616 break; | 618 break; |
| 617 case MEDIA_DEVICE_PERMISSION_DISMISSED: | 619 case MEDIA_DEVICE_PERMISSION_DISMISSED: |
| 618 request_info->requestFailedUASpecific("PermissionDismissedError"); | 620 request_info->requestFailedUASpecific("PermissionDismissedError"); |
| 619 break; | 621 break; |
| (...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 902 sources_.begin(); | 904 sources_.begin(); |
| 903 it != sources_.end(); ++it) { | 905 it != sources_.end(); ++it) { |
| 904 if (source.id() == it->id()) { | 906 if (source.id() == it->id()) { |
| 905 sources_.erase(it); | 907 sources_.erase(it); |
| 906 return; | 908 return; |
| 907 } | 909 } |
| 908 } | 910 } |
| 909 } | 911 } |
| 910 | 912 |
| 911 } // namespace content | 913 } // namespace content |
| OLD | NEW |