| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "media/blink/key_system_config_selector.h" | 5 #include "media/blink/key_system_config_selector.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 758 continue; | 758 continue; |
| 759 case CONFIGURATION_REQUIRES_PERMISSION: | 759 case CONFIGURATION_REQUIRES_PERMISSION: |
| 760 if (request->was_permission_requested) { | 760 if (request->was_permission_requested) { |
| 761 DVLOG(2) << "Rejecting requested configuration because " | 761 DVLOG(2) << "Rejecting requested configuration because " |
| 762 << "permission was denied."; | 762 << "permission was denied."; |
| 763 continue; | 763 continue; |
| 764 } | 764 } |
| 765 { | 765 { |
| 766 // Note: the GURL must not be constructed inline because | 766 // Note: the GURL must not be constructed inline because |
| 767 // base::Passed(&request) sets |request| to null. | 767 // base::Passed(&request) sets |request| to null. |
| 768 GURL security_origin(request->security_origin.toString()); | 768 GURL security_origin( |
| 769 base::string16(request->security_origin.toString())); |
| 769 media_permission_->RequestPermission( | 770 media_permission_->RequestPermission( |
| 770 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin, | 771 MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin, |
| 771 base::Bind(&KeySystemConfigSelector::OnPermissionResult, | 772 base::Bind(&KeySystemConfigSelector::OnPermissionResult, |
| 772 weak_factory_.GetWeakPtr(), base::Passed(&request))); | 773 weak_factory_.GetWeakPtr(), base::Passed(&request))); |
| 773 } | 774 } |
| 774 return; | 775 return; |
| 775 case CONFIGURATION_SUPPORTED: | 776 case CONFIGURATION_SUPPORTED: |
| 776 cdm_config.allow_distinctive_identifier = | 777 cdm_config.allow_distinctive_identifier = |
| 777 (accumulated_configuration.distinctiveIdentifier == | 778 (accumulated_configuration.distinctiveIdentifier == |
| 778 blink::WebMediaKeySystemConfiguration::Requirement::Required); | 779 blink::WebMediaKeySystemConfiguration::Requirement::Required); |
| (...skipping 15 matching lines...) Expand all Loading... |
| 794 | 795 |
| 795 void KeySystemConfigSelector::OnPermissionResult( | 796 void KeySystemConfigSelector::OnPermissionResult( |
| 796 scoped_ptr<SelectionRequest> request, | 797 scoped_ptr<SelectionRequest> request, |
| 797 bool is_permission_granted) { | 798 bool is_permission_granted) { |
| 798 request->was_permission_requested = true; | 799 request->was_permission_requested = true; |
| 799 request->is_permission_granted = is_permission_granted; | 800 request->is_permission_granted = is_permission_granted; |
| 800 SelectConfigInternal(std::move(request)); | 801 SelectConfigInternal(std::move(request)); |
| 801 } | 802 } |
| 802 | 803 |
| 803 } // namespace media | 804 } // namespace media |
| OLD | NEW |