summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-22 15:08:08 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-22 15:08:08 +0000
commit1b6dc3e04f3438ab25faff315890bc82e82a262a (patch)
treec1528eda75d2bfa70ae68d111b65d38920085c15 /chrome/browser/sync
parentb81af210441caf958d664a7abc62050f009e464e (diff)
downloadchromium_src-1b6dc3e04f3438ab25faff315890bc82e82a262a.zip
chromium_src-1b6dc3e04f3438ab25faff315890bc82e82a262a.tar.gz
chromium_src-1b6dc3e04f3438ab25faff315890bc82e82a262a.tar.bz2
Update the time formatting APIs to use string16.
BUG=23581 TEST=everything still works Review URL: http://codereview.chromium.org/6064003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/sync_ui_util.cc8
1 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index 30a4ed4..27fdb9a 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -217,12 +217,12 @@ void AddIntSyncDetail(ListValue* details, const std::string& stat_name,
details->Append(val);
}
-std::wstring ConstructTime(int64 time_in_int) {
+string16 ConstructTime(int64 time_in_int) {
base::Time time = base::Time::FromInternalValue(time_in_int);
// If time is null the format function returns a time in 1969.
if (time.is_null())
- return std::wstring();
+ return string16();
return base::TimeFormatFriendlyDateAndTime(time);
}
@@ -354,9 +354,7 @@ void ConstructAboutInformation(ProfileSyncService* service,
DictionaryValue* val = new DictionaryValue;
val->SetString("stat_name", "Autofill Migration Time");
- val->SetString("stat_value",
- WideToUTF16Hack(
- ConstructTime(info.autofill_migration_time)));
+ val->SetString("stat_value", ConstructTime(info.autofill_migration_time));
details->Append(val);
}
}