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 MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ |
6 #define MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/containers/hash_tables.h" | 12 #include "base/containers/hash_tables.h" |
13 #include "base/macros.h" | 13 #include "base/macros.h" |
14 #include "base/memory/scoped_ptr.h" | |
xhwang
2015/11/11 09:53:21
not needed?
Tima Vaisburd
2015/11/11 23:26:35
Done.
| |
14 #include "media/base/media_export.h" | 15 #include "media/base/media_export.h" |
15 | 16 |
16 namespace media { | 17 namespace media { |
17 | 18 |
18 class MediaClientAndroid; | 19 class MediaClientAndroid; |
19 class MediaDrmBridgeDelegate; | 20 class MediaDrmBridgeDelegate; |
20 | 21 |
21 // Setter for MediaClientAndroid. This should be called early in embedder | 22 // Setter for MediaClientAndroid. This should be called early in embedder |
22 // lifecycle, before any media playback could occur. | 23 // lifecycle, before any media playback could occur. |
23 MEDIA_EXPORT void SetMediaClientAndroid(MediaClientAndroid* media_client); | 24 MEDIA_EXPORT void SetMediaClientAndroid(MediaClientAndroid* media_client); |
(...skipping 26 matching lines...) Expand all Loading... | |
50 friend class KeySystemManager; | 51 friend class KeySystemManager; |
51 | 52 |
52 base::hash_map<std::string, UUID> key_system_uuid_map_; | 53 base::hash_map<std::string, UUID> key_system_uuid_map_; |
53 | 54 |
54 DISALLOW_COPY_AND_ASSIGN(MediaClientAndroid); | 55 DISALLOW_COPY_AND_ASSIGN(MediaClientAndroid); |
55 }; | 56 }; |
56 | 57 |
57 } // namespace media | 58 } // namespace media |
58 | 59 |
59 #endif // MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ | 60 #endif // MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ |
OLD | NEW |