| OLD | NEW |
| 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 "media/cdm/ppapi/cdm_adapter.h" | 5 #include "media/cdm/ppapi/cdm_adapter.h" |
| 6 | 6 |
| 7 #include "media/base/limits.h" | 7 #include "media/base/limits.h" |
| 8 #include "media/cdm/ppapi/cdm_file_io_impl.h" | 8 #include "media/cdm/ppapi/cdm_file_io_impl.h" |
| 9 #include "media/cdm/ppapi/cdm_helpers.h" | |
| 10 #include "media/cdm/ppapi/cdm_logging.h" | 9 #include "media/cdm/ppapi/cdm_logging.h" |
| 11 #include "media/cdm/ppapi/supported_cdm_versions.h" | 10 #include "media/cdm/ppapi/supported_cdm_versions.h" |
| 12 #include "ppapi/c/ppb_console.h" | 11 #include "ppapi/c/ppb_console.h" |
| 13 #include "ppapi/cpp/private/uma_private.h" | 12 #include "ppapi/cpp/private/uma_private.h" |
| 14 | 13 |
| 15 #if defined(CHECK_DOCUMENT_URL) | 14 #if defined(CHECK_DOCUMENT_URL) |
| 16 #include "ppapi/cpp/dev/url_util_dev.h" | 15 #include "ppapi/cpp/dev/url_util_dev.h" |
| 17 #include "ppapi/cpp/instance_handle.h" | 16 #include "ppapi/cpp/instance_handle.h" |
| 18 #endif // defined(CHECK_DOCUMENT_URL) | 17 #endif // defined(CHECK_DOCUMENT_URL) |
| 19 | 18 |
| (...skipping 1319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1339 } // namespace media | 1338 } // namespace media |
| 1340 | 1339 |
| 1341 namespace pp { | 1340 namespace pp { |
| 1342 | 1341 |
| 1343 // Factory function for your specialization of the Module object. | 1342 // Factory function for your specialization of the Module object. |
| 1344 Module* CreateModule() { | 1343 Module* CreateModule() { |
| 1345 return new media::CdmAdapterModule(); | 1344 return new media::CdmAdapterModule(); |
| 1346 } | 1345 } |
| 1347 | 1346 |
| 1348 } // namespace pp | 1347 } // namespace pp |
| OLD | NEW |