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

Side by Side Diff: media/cast/cast_config.h

Issue 1905763002: Convert //media/cast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 | « no previous file | media/cast/cast_environment.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_CAST_CAST_CONFIG_H_ 5 #ifndef MEDIA_CAST_CAST_CONFIG_H_
6 #define MEDIA_CAST_CAST_CONFIG_H_ 6 #define MEDIA_CAST_CAST_CONFIG_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 // The AES crypto key and initialization vector. Each of these strings 206 // The AES crypto key and initialization vector. Each of these strings
207 // contains the data in binary form, of size kAesKeySize. If they are empty 207 // contains the data in binary form, of size kAesKeySize. If they are empty
208 // strings, crypto is not being used. 208 // strings, crypto is not being used.
209 std::string aes_key; 209 std::string aes_key;
210 std::string aes_iv_mask; 210 std::string aes_iv_mask;
211 }; 211 };
212 212
213 // TODO(miu): Remove the CreateVEA callbacks. http://crbug.com/454029 213 // TODO(miu): Remove the CreateVEA callbacks. http://crbug.com/454029
214 typedef base::Callback<void(scoped_refptr<base::SingleThreadTaskRunner>, 214 typedef base::Callback<void(scoped_refptr<base::SingleThreadTaskRunner>,
215 scoped_ptr<media::VideoEncodeAccelerator>)> 215 std::unique_ptr<media::VideoEncodeAccelerator>)>
216 ReceiveVideoEncodeAcceleratorCallback; 216 ReceiveVideoEncodeAcceleratorCallback;
217 typedef base::Callback<void(const ReceiveVideoEncodeAcceleratorCallback&)> 217 typedef base::Callback<void(const ReceiveVideoEncodeAcceleratorCallback&)>
218 CreateVideoEncodeAcceleratorCallback; 218 CreateVideoEncodeAcceleratorCallback;
219 typedef base::Callback<void(scoped_ptr<base::SharedMemory>)> 219 typedef base::Callback<void(std::unique_ptr<base::SharedMemory>)>
220 ReceiveVideoEncodeMemoryCallback; 220 ReceiveVideoEncodeMemoryCallback;
221 typedef base::Callback<void(size_t size, 221 typedef base::Callback<void(size_t size,
222 const ReceiveVideoEncodeMemoryCallback&)> 222 const ReceiveVideoEncodeMemoryCallback&)>
223 CreateVideoEncodeMemoryCallback; 223 CreateVideoEncodeMemoryCallback;
224 224
225 } // namespace cast 225 } // namespace cast
226 } // namespace media 226 } // namespace media
227 227
228 #endif // MEDIA_CAST_CAST_CONFIG_H_ 228 #endif // MEDIA_CAST_CAST_CONFIG_H_
OLDNEW
« no previous file with comments | « no previous file | media/cast/cast_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698