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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: base/i18n/timezone.cc

Issue 2740673002: Prepare Chromium and Blink for ICU 59 (Closed)
Patch Set: revert accidental revert of sftnly roll during rebase Created 3 years, 9 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 | « base/i18n/time_formatting_unittest.cc ('k') | base/i18n/unicodestring.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/i18n/timezone.cc
diff --git a/base/i18n/timezone.cc b/base/i18n/timezone.cc
index e881c9d680f8277dfeb384365399f23a2268c467..95e7aee34c4c159b309de9f5f3f94eb85bd2444e 100644
--- a/base/i18n/timezone.cc
+++ b/base/i18n/timezone.cc
@@ -610,9 +610,9 @@ std::string CountryCodeForCurrentTimezone() {
std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
icu::UnicodeString id;
zone->getID(id);
- string16 olson_code(id.getBuffer(), id.length());
+ std::string olson_code;
return TimezoneMap::GetInstance()->CountryCodeForTimezone(
- UTF16ToUTF8(olson_code));
+ id.toUTF8String(olson_code));
}
} // namespace base
« no previous file with comments | « base/i18n/time_formatting_unittest.cc ('k') | base/i18n/unicodestring.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698