| 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_CRYPTO_AES_DECRYPTOR_H_ | 5 #ifndef MEDIA_CDM_AES_DECRYPTOR_H_ |
| 6 #define MEDIA_CRYPTO_AES_DECRYPTOR_H_ | 6 #define MEDIA_CDM_AES_DECRYPTOR_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 #include <set> | 11 #include <set> |
| 12 #include <string> | 12 #include <string> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "base/containers/scoped_ptr_hash_map.h" | 15 #include "base/containers/scoped_ptr_hash_map.h" |
| 16 #include "base/macros.h" | 16 #include "base/macros.h" |
| (...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 | 158 |
| 159 // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the | 159 // Protect |new_audio_key_cb_| and |new_video_key_cb_| as they are set on the |
| 160 // main thread but called on the media thread. | 160 // main thread but called on the media thread. |
| 161 mutable base::Lock new_key_cb_lock_; | 161 mutable base::Lock new_key_cb_lock_; |
| 162 | 162 |
| 163 DISALLOW_COPY_AND_ASSIGN(AesDecryptor); | 163 DISALLOW_COPY_AND_ASSIGN(AesDecryptor); |
| 164 }; | 164 }; |
| 165 | 165 |
| 166 } // namespace media | 166 } // namespace media |
| 167 | 167 |
| 168 #endif // MEDIA_CRYPTO_AES_DECRYPTOR_H_ | 168 #endif // MEDIA_CDM_AES_DECRYPTOR_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2010793003:
Clean up media header include guards (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master