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

Unified Diff: mojo/gles2/gles2_context.h

Issue 2069663002: Some scoped_ptr -> std::unique_ptr conversion, especially under //mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/gles2/control_thunks_impl.cc ('k') | mojo/message_pump/handle_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/gles2/gles2_context.h
diff --git a/mojo/gles2/gles2_context.h b/mojo/gles2/gles2_context.h
index 52fdaebb811bd61f9e795f130d4bacce5faa97aa..211163961ea30baf87b3185a1c0456eb5f5177b8 100644
--- a/mojo/gles2/gles2_context.h
+++ b/mojo/gles2/gles2_context.h
@@ -5,8 +5,9 @@
#ifndef MOJO_GLES2_GLES2_CONTEXT_H_
#define MOJO_GLES2_GLES2_CONTEXT_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "gpu/command_buffer/client/gles2_implementation.h"
#include "mojo/gles2/command_buffer_client_impl.h"
#include "mojo/public/c/gpu/MGL/mgl_echo.h"
@@ -49,9 +50,9 @@ class GLES2Context : public CommandBufferDelegate, public MGLContextPrivate {
void ContextLost() override;
CommandBufferClientImpl command_buffer_;
- scoped_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
- scoped_ptr<gpu::TransferBuffer> transfer_buffer_;
- scoped_ptr<gpu::gles2::GLES2Implementation> implementation_;
+ std::unique_ptr<gpu::gles2::GLES2CmdHelper> gles2_helper_;
+ std::unique_ptr<gpu::TransferBuffer> transfer_buffer_;
+ std::unique_ptr<gpu::gles2::GLES2Implementation> implementation_;
MGLContextLostCallback lost_callback_;
void* closure_;
« no previous file with comments | « mojo/gles2/control_thunks_impl.cc ('k') | mojo/message_pump/handle_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698