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

Unified Diff: chrome/browser/chromeos/system/timezone_util.cc

Issue 1870793002: Convert //chrome/browser/chromeos 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
Index: chrome/browser/chromeos/system/timezone_util.cc
diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc
index 9c24b2e25cecea17eec5300dcebd6014c6accb93..be305fa9168b16c1690a27d25be7e1aa99cbdc34 100644
--- a/chrome/browser/chromeos/system/timezone_util.cc
+++ b/chrome/browser/chromeos/system/timezone_util.cc
@@ -68,7 +68,7 @@ base::string16 GetExemplarCity(const icu::TimeZone& zone) {
// Resource keys for timezones use ':' in place of '/'.
base::ReplaceSubstringsAfterOffset(&zone_id_str, 0, "/", ":");
- scoped_ptr<UResourceBundle, UResClose> zone_item(
+ std::unique_ptr<UResourceBundle, UResClose> zone_item(
ures_getByKey(zone_strings, zone_id_str.c_str(), NULL, &status));
icu::UnicodeString city;
if (!U_FAILURE(status)) {
@@ -145,10 +145,10 @@ namespace chromeos {
namespace system {
// Creates a list of pairs of each timezone's ID and name.
-scoped_ptr<base::ListValue> GetTimezoneList() {
+std::unique_ptr<base::ListValue> GetTimezoneList() {
const std::vector<icu::TimeZone*> &timezones =
chromeos::system::TimezoneSettings::GetInstance()->GetTimezoneList();
- scoped_ptr<base::ListValue> timezoneList(new base::ListValue());
+ std::unique_ptr<base::ListValue> timezoneList(new base::ListValue());
for (std::vector<icu::TimeZone*>::const_iterator iter = timezones.begin();
iter != timezones.end(); ++iter) {
const icu::TimeZone* timezone = *iter;
« no previous file with comments | « chrome/browser/chromeos/system/timezone_util.h ('k') | chrome/browser/chromeos/system_logs/debug_daemon_log_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698