Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 ANDROID_WEBVIEW_COMMON_AW_MEDIA_CLIENT_ANDROID_H_ | 5 #ifndef ANDROID_WEBVIEW_COMMON_AW_MEDIA_CLIENT_ANDROID_H_ |
|
boliu
2017/03/21 18:09:10
fix ifdef guard
chcunningham
2017/03/21 22:18:16
Done.
| |
| 6 #define ANDROID_WEBVIEW_COMMON_AW_MEDIA_CLIENT_ANDROID_H_ | 6 #define ANDROID_WEBVIEW_COMMON_AW_MEDIA_CLIENT_ANDROID_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "components/cdm/common/widevine_drm_delegate_android.h" | 9 #include "components/cdm/common/widevine_drm_delegate_android.h" |
| 10 #include "media/base/android/media_client_android.h" | 10 #include "media/base/android/media_drm_bridge_client.h" |
| 11 | 11 |
| 12 namespace android_webview { | 12 namespace android_webview { |
| 13 | 13 |
| 14 class AwMediaClientAndroid : public media::MediaClientAndroid { | 14 class AwMediaDrmBridgeClient : public media::MediaDrmBridgeClient { |
| 15 public: | 15 public: |
| 16 // |key_system_uuid_mappings| is a list of strings containing key-system/UUID | 16 // |key_system_uuid_mappings| is a list of strings containing key-system/UUID |
| 17 // pairs, in the format "key system name,UUID as string". | 17 // pairs, in the format "key system name,UUID as string". |
| 18 explicit AwMediaClientAndroid( | 18 explicit AwMediaDrmBridgeClient( |
| 19 const std::vector<std::string>& key_system_uuid_mappings); | 19 const std::vector<std::string>& key_system_uuid_mappings); |
| 20 ~AwMediaClientAndroid() override; | 20 ~AwMediaDrmBridgeClient() override; |
| 21 | 21 |
| 22 private: | 22 private: |
| 23 // media::MediaClientAndroid implementation: | 23 // media::MediaDrmBridgeClient implementation: |
| 24 void AddKeySystemUUIDMappings(KeySystemUuidMap* map) override; | 24 void AddKeySystemUUIDMappings(KeySystemUuidMap* map) override; |
| 25 media::MediaDrmBridgeDelegate* GetMediaDrmBridgeDelegate( | 25 media::MediaDrmBridgeDelegate* GetMediaDrmBridgeDelegate( |
| 26 const media::UUID& scheme_uuid) override; | 26 const media::UUID& scheme_uuid) override; |
| 27 | 27 |
| 28 std::vector<std::string> key_system_uuid_mappings_; | 28 std::vector<std::string> key_system_uuid_mappings_; |
| 29 cdm::WidevineDrmDelegateAndroid widevine_delegate_; | 29 cdm::WidevineDrmDelegateAndroid widevine_delegate_; |
| 30 | 30 |
| 31 DISALLOW_COPY_AND_ASSIGN(AwMediaClientAndroid); | 31 DISALLOW_COPY_AND_ASSIGN(AwMediaDrmBridgeClient); |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 } // namespace android_webview | 34 } // namespace android_webview |
| 35 | 35 |
| 36 #endif // ANDROID_WEBVIEW_COMMON_AW_MEDIA_CLIENT_ANDROID_H_ | 36 #endif // ANDROID_WEBVIEW_COMMON_AW_MEDIA_CLIENT_ANDROID_H_ |
| OLD | NEW |