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

Unified Diff: ppapi/shared_impl/media_stream_buffer_manager.h

Issue 1864293002: Convert //ppapi to use std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more nullptr 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/shared_impl/compositor_layer_data.cc ('k') | ppapi/shared_impl/media_stream_buffer_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/shared_impl/media_stream_buffer_manager.h
diff --git a/ppapi/shared_impl/media_stream_buffer_manager.h b/ppapi/shared_impl/media_stream_buffer_manager.h
index d965b11b026a47ec6de7ac0a415a1cea3d0b0c8e..6a1cf0dd5d196222bf01a6a3a2e3cb2680a2f8c9 100644
--- a/ppapi/shared_impl/media_stream_buffer_manager.h
+++ b/ppapi/shared_impl/media_stream_buffer_manager.h
@@ -8,11 +8,11 @@
#include <stdint.h>
#include <deque>
+#include <memory>
#include <vector>
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/shared_memory.h"
#include "ppapi/shared_impl/ppapi_shared_export.h"
@@ -61,7 +61,7 @@ class PPAPI_SHARED_EXPORT MediaStreamBufferManager {
// Initializes shared memory for buffers transmission.
bool SetBuffers(int32_t number_of_buffers,
int32_t buffer_size,
- scoped_ptr<base::SharedMemory> shm,
+ std::unique_ptr<base::SharedMemory> shm,
bool enqueue_all_buffers);
// Dequeues a buffer from |buffer_queue_|.
@@ -95,7 +95,7 @@ class PPAPI_SHARED_EXPORT MediaStreamBufferManager {
int32_t number_of_buffers_;
// A memory block shared between renderer process and plugin process.
- scoped_ptr<base::SharedMemory> shm_;
+ std::unique_ptr<base::SharedMemory> shm_;
DISALLOW_COPY_AND_ASSIGN(MediaStreamBufferManager);
};
« no previous file with comments | « ppapi/shared_impl/compositor_layer_data.cc ('k') | ppapi/shared_impl/media_stream_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698