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

Unified Diff: cc/resources/scoped_resource.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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 | « cc/resources/resource_provider_unittest.cc ('k') | cc/resources/scoped_resource_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/resources/scoped_resource.h
diff --git a/cc/resources/scoped_resource.h b/cc/resources/scoped_resource.h
index 0e50d0ab68e59788a51525f682c888bf5942f2c0..1190b47c9553ed9bab94d24cc8c4d906a95d8a1c 100644
--- a/cc/resources/scoped_resource.h
+++ b/cc/resources/scoped_resource.h
@@ -5,9 +5,11 @@
#ifndef CC_RESOURCES_SCOPED_RESOURCE_H_
#define CC_RESOURCES_SCOPED_RESOURCE_H_
+#include <memory>
+
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
#include "cc/base/cc_export.h"
#include "cc/resources/resource.h"
@@ -19,9 +21,9 @@ namespace cc {
class CC_EXPORT ScopedResource : public Resource {
public:
- static scoped_ptr<ScopedResource> Create(
+ static std::unique_ptr<ScopedResource> Create(
ResourceProvider* resource_provider) {
- return make_scoped_ptr(new ScopedResource(resource_provider));
+ return base::WrapUnique(new ScopedResource(resource_provider));
}
virtual ~ScopedResource();
« no previous file with comments | « cc/resources/resource_provider_unittest.cc ('k') | cc/resources/scoped_resource_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698