diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-24 23:12:15 +0000 |
| commit | cc2a2a22ebb171ff4c1eb528b3f8d7e551512732 (patch) | |
| tree | 9a010de6ab6210b43e4bc7cfa187ef3a80312a0b /chrome/browser/chromeos/system/timezone_util.cc | |
| parent | 8af3b22a0f64133ba32f4deaedc6540060520ff7 (diff) | |
| download | chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.zip chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.gz chromium_src-cc2a2a22ebb171ff4c1eb528b3f8d7e551512732.tar.bz2 | |
Revert 242455 "Revert 242449 "Update some uses of UTF conversion..."
> Revert 242449 "Update some uses of UTF conversions in chrome/bro..."
>
> > Update some uses of UTF conversions in chrome/browser to use the base:: namespace.
> >
> > BUG=330556
> > TEST=no change
> > TBR=ben@chromium.org
> >
> > Review URL: https://codereview.chromium.org/120943002
>
> TBR=avi@chromium.org
>
> Review URL: https://codereview.chromium.org/103853007
TBR=avi@chromium.org
Review URL: https://codereview.chromium.org/120993002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/system/timezone_util.cc')
| -rw-r--r-- | chrome/browser/chromeos/system/timezone_util.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc index 7308632..e396942 100644 --- a/chrome/browser/chromeos/system/timezone_util.cc +++ b/chrome/browser/chromeos/system/timezone_util.cc @@ -78,7 +78,7 @@ base::string16 GetExemplarCity(const icu::TimeZone& zone) { zone_id_str.erase(0, slash_pos + 1); // zone id has '_' in place of ' '. ReplaceSubstringsAfterOffset(&zone_id_str, 0, "_", " "); - return ASCIIToUTF16(zone_id_str); + return base::ASCIIToUTF16(zone_id_str); } // Gets the given timezone's name for visualization. @@ -113,8 +113,10 @@ base::string16 GetTimezoneName(const icu::TimeZone& timezone) { icu::UnicodeString name; timezone.getDisplayName(dst_offset != 0, icu::TimeZone::LONG, name); base::string16 result(l10n_util::GetStringFUTF16( - IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, ASCIIToUTF16(offset_str), - base::string16(name.getBuffer(), name.length()), GetExemplarCity(timezone))); + IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, + base::ASCIIToUTF16(offset_str), + base::string16(name.getBuffer(), name.length()), + GetExemplarCity(timezone))); base::i18n::AdjustStringForLocaleDirection(&result); return result; } |