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

Unified Diff: ui/base/l10n/formatter.cc

Issue 1539583003: Convert Pass()→std::move() in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/accelerators/accelerator.h ('k') | ui/base/models/list_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/l10n/formatter.cc
diff --git a/ui/base/l10n/formatter.cc b/ui/base/l10n/formatter.cc
index 298646d9e2c61245113821ea2aaf929435e74a08..3834d0ff16d5b6cfbf268479dc3ad5e20ce1259e 100644
--- a/ui/base/l10n/formatter.cc
+++ b/ui/base/l10n/formatter.cc
@@ -151,7 +151,7 @@ scoped_ptr<icu::PluralRules> BuildPluralRules() {
rules.reset(icu::PluralRules::createRules(fallback_rules, err));
DCHECK(U_SUCCESS(err));
}
- return rules.Pass();
+ return rules;
}
void FormatNumberInPlural(const icu::MessageFormat& format, int number,
@@ -242,7 +242,7 @@ scoped_ptr<icu::MessageFormat> Formatter::CreateFallbackFormat(
scoped_ptr<icu::MessageFormat> format(
new icu::MessageFormat(pattern, error));
DCHECK(U_SUCCESS(error));
- return format.Pass();
+ return format;
}
scoped_ptr<icu::MessageFormat> Formatter::InitFormat(
@@ -254,7 +254,7 @@ scoped_ptr<icu::MessageFormat> Formatter::InitFormat(
icu::UnicodeString(FALSE, pattern.data(), pattern.length()), error));
DCHECK(U_SUCCESS(error));
if (format.get())
- return format.Pass();
+ return format;
}
scoped_ptr<icu::PluralRules> rules(BuildPluralRules());
« no previous file with comments | « ui/base/accelerators/accelerator.h ('k') | ui/base/models/list_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698