OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_BLINK_WEBMEDIAPLAYER_PARAMS_H_ | 5 #ifndef MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ |
6 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ | 6 #define MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ |
7 | 7 |
8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/macros.h" |
9 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
10 #include "media/blink/media_blink_export.h" | 11 #include "media/blink/media_blink_export.h" |
11 #include "media/filters/context_3d.h" | 12 #include "media/filters/context_3d.h" |
12 | 13 |
13 namespace base { | 14 namespace base { |
14 class SingleThreadTaskRunner; | 15 class SingleThreadTaskRunner; |
15 class TaskRunner; | 16 class TaskRunner; |
16 } | 17 } |
17 | 18 |
18 namespace blink { | 19 namespace blink { |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
105 // TODO(xhwang): Remove after prefixed EME API support is removed. | 106 // TODO(xhwang): Remove after prefixed EME API support is removed. |
106 MediaPermission* media_permission_; | 107 MediaPermission* media_permission_; |
107 blink::WebContentDecryptionModule* initial_cdm_; | 108 blink::WebContentDecryptionModule* initial_cdm_; |
108 | 109 |
109 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams); | 110 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerParams); |
110 }; | 111 }; |
111 | 112 |
112 } // namespace media | 113 } // namespace media |
113 | 114 |
114 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ | 115 #endif // MEDIA_BLINK_WEBMEDIAPLAYER_PARAMS_H_ |
OLD | NEW |