Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(308)

Side by Side Diff: components/cdm/renderer/widevine_key_systems.cc

Issue 1546143002: Switch to standard integer types in components/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "components/cdm/renderer/widevine_key_systems.h" 5 #include "components/cdm/renderer/widevine_key_systems.h"
6 6
7 #include <stddef.h>
8
7 #include <string> 9 #include <string>
8 #include <vector> 10 #include <vector>
9 11
10 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "build/build_config.h"
11 #include "media/base/eme_constants.h" 14 #include "media/base/eme_constants.h"
12 15
13 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 16 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
14 17
15 #if defined(WIDEVINE_CDM_AVAILABLE) 18 #if defined(WIDEVINE_CDM_AVAILABLE)
16 19
17 using media::KeySystemInfo; 20 using media::KeySystemInfo;
18 using media::SupportedCodecs; 21 using media::SupportedCodecs;
19 22
20 namespace cdm { 23 namespace cdm {
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 #if defined(ENABLE_PEPPER_CDMS) 87 #if defined(ENABLE_PEPPER_CDMS)
85 info.pepper_type = kWidevineCdmPluginMimeType; 88 info.pepper_type = kWidevineCdmPluginMimeType;
86 #endif // defined(ENABLE_PEPPER_CDMS) 89 #endif // defined(ENABLE_PEPPER_CDMS)
87 90
88 concrete_key_systems->push_back(info); 91 concrete_key_systems->push_back(info);
89 } 92 }
90 93
91 } // namespace cdm 94 } // namespace cdm
92 95
93 #endif // defined(WIDEVINE_CDM_AVAILABLE) 96 #endif // defined(WIDEVINE_CDM_AVAILABLE)
OLDNEW
« no previous file with comments | « components/cdm/common/cdm_message_generator.h ('k') | components/certificate_reporting/error_reporter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698