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

Unified Diff: ui/base/resource/resource_bundle.cc

Issue 2463713002: Replace unique_ptr.reset with std::move() in resource_bundle.cc (Closed)
Patch Set: Created 4 years, 2 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 | « AUTHORS ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle.cc
diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc
index 54489c1c33fd922e0eef1999e57024528940ca91..d20272910ca6976261ea2b1038791a75c9dc82e5 100644
--- a/ui/base/resource/resource_bundle.cc
+++ b/ui/base/resource/resource_bundle.cc
@@ -215,7 +215,7 @@ void ResourceBundle::InitSharedInstanceWithPakFileRegion(
NOTREACHED() << "failed to load pak file";
return;
}
- g_shared_instance_->locale_resources_data_.reset(data_pack.release());
+ g_shared_instance_->locale_resources_data_ = std::move(data_pack);
g_shared_instance_->InitDefaultFontList();
}
@@ -336,7 +336,7 @@ std::string ResourceBundle::LoadLocaleResources(
return std::string();
}
- locale_resources_data_.reset(data_pack.release());
+ locale_resources_data_ = std::move(data_pack);
return app_locale;
}
#endif // defined(OS_ANDROID)
@@ -353,7 +353,7 @@ void ResourceBundle::LoadTestResources(const base::FilePath& path,
data_pack.reset(new DataPack(ui::SCALE_FACTOR_NONE));
if (!locale_path.empty() && data_pack->LoadFromPath(locale_path)) {
- locale_resources_data_.reset(data_pack.release());
+ locale_resources_data_ = std::move(data_pack);
} else {
locale_resources_data_.reset(new DataPack(ui::SCALE_FACTOR_NONE));
}
« no previous file with comments | « AUTHORS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698