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

Side by Side Diff: media/cdm/cdm_wrapper.h

Issue 1535193003: Add missing macros includes in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
« no previous file with comments | « media/cdm/aes_decryptor.h ('k') | media/cdm/external_clear_key_test_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_CDM_CDM_WRAPPER_H_ 5 #ifndef MEDIA_CDM_CDM_WRAPPER_H_
6 #define MEDIA_CDM_CDM_WRAPPER_H_ 6 #define MEDIA_CDM_CDM_WRAPPER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h"
10 #include "media/cdm/api/content_decryption_module.h" 11 #include "media/cdm/api/content_decryption_module.h"
11 #include "media/cdm/supported_cdm_versions.h" 12 #include "media/cdm/supported_cdm_versions.h"
12 13
13 #if defined(USE_PPAPI_CDM_ADAPTER) 14 #if defined(USE_PPAPI_CDM_ADAPTER)
14 // When building the ppapi adapter do not include any non-trivial base/ headers. 15 // When building the ppapi adapter do not include any non-trivial base/ headers.
15 #include "ppapi/cpp/logging.h" 16 #include "ppapi/cpp/logging.h"
16 #define PLATFORM_DCHECK PP_DCHECK 17 #define PLATFORM_DCHECK PP_DCHECK
17 #else 18 #else
18 #include "base/logging.h" 19 #include "base/logging.h"
19 #define PLATFORM_DCHECK DCHECK 20 #define PLATFORM_DCHECK DCHECK
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 // Also update supported_cdm_versions.h. 317 // Also update supported_cdm_versions.h.
317 static_assert(cdm::ContentDecryptionModule::kVersion == 318 static_assert(cdm::ContentDecryptionModule::kVersion ==
318 cdm::ContentDecryptionModule_8::kVersion, 319 cdm::ContentDecryptionModule_8::kVersion,
319 "ensure cdm wrapper templates have old version support"); 320 "ensure cdm wrapper templates have old version support");
320 321
321 } // namespace media 322 } // namespace media
322 323
323 #undef PLATFORM_DCHECK 324 #undef PLATFORM_DCHECK
324 325
325 #endif // MEDIA_CDM_CDM_WRAPPER_H_ 326 #endif // MEDIA_CDM_CDM_WRAPPER_H_
OLDNEW
« no previous file with comments | « media/cdm/aes_decryptor.h ('k') | media/cdm/external_clear_key_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698