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

Unified Diff: ios/chrome/tools/strings/generate_localizable_strings.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « ios/chrome/test/testing_application_context.mm ('k') | ios/crnet/crnet_environment.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/tools/strings/generate_localizable_strings.mm
diff --git a/ios/chrome/tools/strings/generate_localizable_strings.mm b/ios/chrome/tools/strings/generate_localizable_strings.mm
index 0352f9eb2c63ce304ac9dae7e4e40eb83f716081..95e733f5875e12a7c1531ae1b8aa1aabc454912a 100644
--- a/ios/chrome/tools/strings/generate_localizable_strings.mm
+++ b/ios/chrome/tools/strings/generate_localizable_strings.mm
@@ -41,9 +41,10 @@ namespace {
// Load the packed resource data pack for |locale| from |packed_data_pack_dir|.
// If loading fails, null is returned.
-scoped_ptr<ui::DataPack> LoadResourceDataPack(NSString* packed_data_pack_dir,
- NSString* locale_name) {
- scoped_ptr<ui::DataPack> resource_data_pack;
+std::unique_ptr<ui::DataPack> LoadResourceDataPack(
+ NSString* packed_data_pack_dir,
+ NSString* locale_name) {
+ std::unique_ptr<ui::DataPack> resource_data_pack;
NSString* resource_path =
[NSString stringWithFormat:@"%@/%@.lproj/locale.pak",
packed_data_pack_dir, locale_name];
@@ -336,7 +337,7 @@ int main(int argc, char* const argv[]) {
}
for (NSString* locale in locales) {
- scoped_ptr<ui::DataPack> data_pack =
+ std::unique_ptr<ui::DataPack> data_pack =
LoadResourceDataPack(data_pack_dir, locale);
if (!data_pack) {
fprintf(stderr, "ERROR: Failed to load branded pak for language: %s\n",
« no previous file with comments | « ios/chrome/test/testing_application_context.mm ('k') | ios/crnet/crnet_environment.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698