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

Side by Side Diff: media/cdm/ppapi/cdm_adapter.h

Issue 301933002: Changing default_url to destination_url for consistency (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removing nit Created 6 years, 6 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
« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/ppapi/cdm_adapter.cc » ('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_PPAPI_CDM_ADAPTER_H_ 5 #ifndef MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 6 #define MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 122
123 // <code>PPB_ContentDecryptor_Private</code> dispatchers. These are passed to 123 // <code>PPB_ContentDecryptor_Private</code> dispatchers. These are passed to
124 // <code>callback_factory_</code> to ensure that calls into 124 // <code>callback_factory_</code> to ensure that calls into
125 // <code>PPP_ContentDecryptor_Private</code> are asynchronous. 125 // <code>PPP_ContentDecryptor_Private</code> are asynchronous.
126 void SendSessionCreatedInternal(int32_t result, 126 void SendSessionCreatedInternal(int32_t result,
127 uint32_t session_id, 127 uint32_t session_id,
128 const std::string& web_session_id); 128 const std::string& web_session_id);
129 void SendSessionMessageInternal(int32_t result, 129 void SendSessionMessageInternal(int32_t result,
130 uint32_t session_id, 130 uint32_t session_id,
131 const std::vector<uint8>& message, 131 const std::vector<uint8>& message,
132 const std::string& default_url); 132 const std::string& destination_url);
133 void SendSessionReadyInternal(int32_t result, uint32_t session_id); 133 void SendSessionReadyInternal(int32_t result, uint32_t session_id);
134 void SendSessionClosedInternal(int32_t result, uint32_t session_id); 134 void SendSessionClosedInternal(int32_t result, uint32_t session_id);
135 void SendSessionErrorInternal(int32_t result, 135 void SendSessionErrorInternal(int32_t result,
136 uint32_t session_id, 136 uint32_t session_id,
137 cdm::MediaKeyError error_code, 137 cdm::MediaKeyError error_code,
138 uint32_t system_code); 138 uint32_t system_code);
139 139
140 void DeliverBlock(int32_t result, 140 void DeliverBlock(int32_t result,
141 const cdm::Status& status, 141 const cdm::Status& status,
142 const LinkedDecryptedBlock& decrypted_block, 142 const LinkedDecryptedBlock& decrypted_block,
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 uint32_t deferred_audio_decoder_config_id_; 215 uint32_t deferred_audio_decoder_config_id_;
216 bool deferred_initialize_video_decoder_; 216 bool deferred_initialize_video_decoder_;
217 uint32_t deferred_video_decoder_config_id_; 217 uint32_t deferred_video_decoder_config_id_;
218 218
219 DISALLOW_COPY_AND_ASSIGN(CdmAdapter); 219 DISALLOW_COPY_AND_ASSIGN(CdmAdapter);
220 }; 220 };
221 221
222 } // namespace media 222 } // namespace media
223 223
224 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_ 224 #endif // MEDIA_CDM_PPAPI_CDM_ADAPTER_H_
OLDNEW
« no previous file with comments | « media/cdm/aes_decryptor_unittest.cc ('k') | media/cdm/ppapi/cdm_adapter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698