Chromium Code Reviews Chromium Code Reviews
Issue 2568463003:
media: Rename MediaKeys to ContentDecryptionModule (Closed)
| OLD | NEW |
|---|---|
| 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 "media/cdm/default_cdm_factory.h" | 5 #include "media/cdm/default_cdm_factory.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 48 return; | 48 return; |
| 49 } | 49 } |
| 50 | 50 |
| 51 if (!ShouldCreateAesDecryptor(key_system)) { | 51 if (!ShouldCreateAesDecryptor(key_system)) { |
| 52 base::ThreadTaskRunnerHandle::Get()->PostTask( | 52 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 53 FROM_HERE, | 53 FROM_HERE, |
| 54 base::Bind(cdm_created_cb, nullptr, "Unsupported key system.")); | 54 base::Bind(cdm_created_cb, nullptr, "Unsupported key system.")); |
| 55 return; | 55 return; |
| 56 } | 56 } |
| 57 | 57 |
| 58 scoped_refptr<MediaKeys> cdm( | 58 scoped_refptr<ContentDecryptionModule> cdm( |
|
jrummell
2016/12/12 22:08:40
nit: Should include content_decryption_module.h.
xhwang
2016/12/12 22:32:50
Done.
| |
| 59 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, | 59 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, |
| 60 session_keys_change_cb)); | 60 session_keys_change_cb)); |
| 61 base::ThreadTaskRunnerHandle::Get()->PostTask( | 61 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 62 FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); | 62 FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); |
| 63 } | 63 } |
| 64 | 64 |
| 65 } // namespace media | 65 } // namespace media |
| OLD | NEW |
