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

Side by Side Diff: chrome/renderer/media/chrome_key_systems.cc

Issue 1548153002: Switch to standard integer types in chrome/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 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 #include "chrome/renderer/media/chrome_key_systems.h" 5 #include "chrome/renderer/media/chrome_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"
11 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
12 #include "base/strings/string_split.h" 14 #include "base/strings/string_split.h"
13 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "build/build_config.h"
14 #include "chrome/common/render_messages.h" 17 #include "chrome/common/render_messages.h"
15 #include "components/cdm/renderer/widevine_key_systems.h" 18 #include "components/cdm/renderer/widevine_key_systems.h"
16 #include "content/public/renderer/render_thread.h" 19 #include "content/public/renderer/render_thread.h"
17 #include "media/base/eme_constants.h" 20 #include "media/base/eme_constants.h"
18 21
19 #if defined(OS_ANDROID) 22 #if defined(OS_ANDROID)
20 #include "components/cdm/renderer/android_key_systems.h" 23 #include "components/cdm/renderer/android_key_systems.h"
21 #endif 24 #endif
22 25
23 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR. 26 #include "widevine_cdm_version.h" // In SHARED_INTERMEDIATE_DIR.
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 224
222 #if defined(WIDEVINE_CDM_AVAILABLE) 225 #if defined(WIDEVINE_CDM_AVAILABLE)
223 AddPepperBasedWidevine(key_systems_info); 226 AddPepperBasedWidevine(key_systems_info);
224 #endif // defined(WIDEVINE_CDM_AVAILABLE) 227 #endif // defined(WIDEVINE_CDM_AVAILABLE)
225 #endif // defined(ENABLE_PEPPER_CDMS) 228 #endif // defined(ENABLE_PEPPER_CDMS)
226 229
227 #if defined(OS_ANDROID) 230 #if defined(OS_ANDROID)
228 cdm::AddAndroidWidevine(key_systems_info); 231 cdm::AddAndroidWidevine(key_systems_info);
229 #endif // defined(OS_ANDROID) 232 #endif // defined(OS_ANDROID)
230 } 233 }
OLDNEW
« no previous file with comments | « chrome/renderer/media/cast_udp_transport.h ('k') | chrome/renderer/media/chrome_webrtc_log_message_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698