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

Unified Diff: content/gpu/gpu_child_thread.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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 | « content/app/mojo/mojo_init.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_child_thread.h
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index ccc7ac9843ea99e5e6bfc57f10e22dc0990bdee6..597afef350594cb156c1d1b83d028d2f5a2ac258 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <queue>
#include <string>
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
#include "build/build_config.h"
#include "content/child/child_thread_impl.h"
@@ -165,9 +165,9 @@ class GpuChildThread : public ChildThreadImpl,
// Non-owning.
gpu::SyncPointManager* sync_point_manager_;
- scoped_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
+ std::unique_ptr<gpu::GpuChannelManager> gpu_channel_manager_;
- scoped_ptr<MediaService> media_service_;
+ std::unique_ptr<MediaService> media_service_;
// Information about the GPU, such as device and vendor ID.
gpu::GPUInfo gpu_info_;
@@ -182,7 +182,7 @@ class GpuChildThread : public ChildThreadImpl,
gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_;
// Process control for Mojo application hosting.
- scoped_ptr<GpuProcessControlImpl> process_control_;
+ std::unique_ptr<GpuProcessControlImpl> process_control_;
// Bindings to the mojom::ProcessControl impl.
mojo::BindingSet<mojom::ProcessControl> process_control_bindings_;
« no previous file with comments | « content/app/mojo/mojo_init.cc ('k') | content/gpu/gpu_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698