| 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 <stdint.h> |
| 9 |
| 8 #include <string> | 10 #include <string> |
| 9 #include <utility> | 11 #include <utility> |
| 10 #include <vector> | 12 #include <vector> |
| 11 | 13 |
| 12 #include "base/containers/hash_tables.h" | 14 #include "base/containers/hash_tables.h" |
| 13 #include "base/macros.h" | 15 #include "base/macros.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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 friend class KeySystemManager; | 52 friend class KeySystemManager; |
| 51 | 53 |
| 52 base::hash_map<std::string, UUID> key_system_uuid_map_; | 54 base::hash_map<std::string, UUID> key_system_uuid_map_; |
| 53 | 55 |
| 54 DISALLOW_COPY_AND_ASSIGN(MediaClientAndroid); | 56 DISALLOW_COPY_AND_ASSIGN(MediaClientAndroid); |
| 55 }; | 57 }; |
| 56 | 58 |
| 57 } // namespace media | 59 } // namespace media |
| 58 | 60 |
| 59 #endif // MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_H_ | 61 #endif // MEDIA_BASE_ANDROID_MEDIA_CLIENT_ANDROID_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