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

Unified Diff: ui/base/resource/data_pack.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/base/nine_image_painter_factory.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/data_pack.h
diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h
index 1292203a6bbf2a160265a98b705558b56473deae..46578186f23161a22b61e0924ad6a84d82d95c1b 100644
--- a/ui/base/resource/data_pack.h
+++ b/ui/base/resource/data_pack.h
@@ -13,11 +13,11 @@
#include <stdint.h>
#include <map>
+#include <memory>
#include "base/files/file.h"
#include "base/files/memory_mapped_file.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/strings/string_piece.h"
#include "ui/base/resource/data_pack_export.h"
@@ -79,7 +79,7 @@ class UI_DATA_PACK_EXPORT DataPack : public ResourceHandle {
bool LoadImpl();
// The memory-mapped data.
- scoped_ptr<base::MemoryMappedFile> mmap_;
+ std::unique_ptr<base::MemoryMappedFile> mmap_;
// Number of resources in the data.
size_t resource_count_;
« no previous file with comments | « ui/base/nine_image_painter_factory.cc ('k') | ui/base/resource/resource_bundle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698