| OLD | NEW |
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "ppapi/c/private/ppb_content_decryptor_private.h" | 5 #include "ppapi/c/private/ppb_content_decryptor_private.h" |
| 6 #include "ppapi/thunk/enter.h" | 6 #include "ppapi/thunk/enter.h" |
| 7 #include "ppapi/thunk/ppb_instance_api.h" | 7 #include "ppapi/thunk/ppb_instance_api.h" |
| 8 #include "ppapi/thunk/thunk.h" | 8 #include "ppapi/thunk/thunk.h" |
| 9 | 9 |
| 10 namespace ppapi { | 10 namespace ppapi { |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 &DecoderInitializeDone, | 118 &DecoderInitializeDone, |
| 119 &DecoderDeinitializeDone, | 119 &DecoderDeinitializeDone, |
| 120 &DecoderResetDone, | 120 &DecoderResetDone, |
| 121 &DeliverFrame, | 121 &DeliverFrame, |
| 122 &DeliverSamples | 122 &DeliverSamples |
| 123 }; | 123 }; |
| 124 | 124 |
| 125 } // namespace | 125 } // namespace |
| 126 | 126 |
| 127 const PPB_ContentDecryptor_Private* | 127 const PPB_ContentDecryptor_Private* |
| 128 GetPPB_ContentDecryptor_Private_0_5_Thunk() { | 128 GetPPB_ContentDecryptor_Private_0_6_Thunk() { |
| 129 return &g_ppb_decryption_thunk; | 129 return &g_ppb_decryption_thunk; |
| 130 } | 130 } |
| 131 | 131 |
| 132 } // namespace thunk | 132 } // namespace thunk |
| 133 } // namespace ppapi | 133 } // namespace ppapi |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11270057:
Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src