| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_DECRYPT_CONFIG_H_ | 5 #ifndef MEDIA_BASE_DECRYPT_CONFIG_H_ |
| 6 #define MEDIA_BASE_DECRYPT_CONFIG_H_ | 6 #define MEDIA_BASE_DECRYPT_CONFIG_H_ |
| 7 | 7 |
| 8 #include <stdint.h> |
| 9 |
| 8 #include <iosfwd> | 10 #include <iosfwd> |
| 9 #include <string> | 11 #include <string> |
| 10 #include <vector> | 12 #include <vector> |
| 11 | 13 |
| 12 #include "base/macros.h" | 14 #include "base/macros.h" |
| 13 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
| 14 #include "media/base/media_export.h" | 16 #include "media/base/media_export.h" |
| 15 | 17 |
| 16 namespace media { | 18 namespace media { |
| 17 | 19 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 }; | 76 }; |
| 75 | 77 |
| 76 } // namespace media | 78 } // namespace media |
| 77 | 79 |
| 78 inline std::ostream& operator<<(std::ostream& os, | 80 inline std::ostream& operator<<(std::ostream& os, |
| 79 const media::DecryptConfig& obj) { | 81 const media::DecryptConfig& obj) { |
| 80 return obj.Print(os); | 82 return obj.Print(os); |
| 81 } | 83 } |
| 82 | 84 |
| 83 #endif // MEDIA_BASE_DECRYPT_CONFIG_H_ | 85 #endif // MEDIA_BASE_DECRYPT_CONFIG_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1542013004:
Switch to standard integer types in media/, take 2. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master