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

Unified Diff: ui/base/resource/resource_bundle.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/resource/data_pack.h ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.h
diff --git a/ui/base/resource/resource_bundle.h b/ui/base/resource/resource_bundle.h
index 61f2861b1e9db8e63f5c4ce103233a0e864598dc..76a5c6f63768d26b53c62215c698f0f47e3ef339 100644
--- a/ui/base/resource/resource_bundle.h
+++ b/ui/base/resource/resource_bundle.h
@@ -8,6 +8,7 @@
#include <stddef.h>
#include <map>
+#include <memory>
#include <string>
#include "base/containers/hash_tables.h"
@@ -15,7 +16,6 @@
#include "base/files/memory_mapped_file.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "base/strings/string16.h"
#include "base/strings/string_piece.h"
@@ -410,13 +410,13 @@ class UI_BASE_EXPORT ResourceBundle {
Delegate* delegate_;
// Protects |images_| and font-related members.
- scoped_ptr<base::Lock> images_and_fonts_lock_;
+ std::unique_ptr<base::Lock> images_and_fonts_lock_;
// Protects |locale_resources_data_|.
- scoped_ptr<base::Lock> locale_resources_data_lock_;
+ std::unique_ptr<base::Lock> locale_resources_data_lock_;
// Handles for data sources.
- scoped_ptr<ResourceHandle> locale_resources_data_;
+ std::unique_ptr<ResourceHandle> locale_resources_data_;
ScopedVector<ResourceHandle> data_packs_;
// The maximum scale factor currently loaded.
« no previous file with comments | « ui/base/resource/data_pack.h ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698