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

Unified Diff: ui/base/resource/resource_bundle_mac.mm

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/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_mac.mm
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index 0b8d526c9a60613446f22da26a79c8c8350772cd..8f5934cece83c4ce09fec9ef6f2451d10d6933e3 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -73,9 +73,9 @@ void ResourceBundle::LoadMaterialDesignResources() {
// initialized at the time it is called.
// TODO(shrike) - remove this method and restore loading of Material Design
// packs to LoadCommonResources() when the MaterialDesignController goes away.
- std::vector<scoped_ptr<ResourceHandle>> tmp_packs;
+ std::vector<std::unique_ptr<ResourceHandle>> tmp_packs;
for (auto it = data_packs_.begin(); it != data_packs_.end(); ++it) {
- scoped_ptr<ResourceHandle> next_pack(*it);
+ std::unique_ptr<ResourceHandle> next_pack(*it);
tmp_packs.push_back(std::move(next_pack));
}
data_packs_.weak_clear();
« no previous file with comments | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698