| Index: chrome/browser/chromeos/dom_ui/system_options_handler.cc
|
| diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc
|
| index fed9222986fca233d17fc3fffc714adcece5f5ec..b2805266a4660deef4db60f9e412e82e908cfa4b 100644
|
| --- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc
|
| +++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc
|
| @@ -107,11 +107,10 @@ ListValue* SystemOptionsHandler::GetTimezoneList() {
|
| for (std::vector<icu::TimeZone*>::iterator iter = timezones_.begin();
|
| iter != timezones_.end(); ++iter) {
|
| const icu::TimeZone* timezone = *iter;
|
| - static const std::wstring delimiter(L"|");
|
| - std::wstring value = GetTimezoneID(timezone);
|
| - value += delimiter;
|
| - value += GetTimezoneName(timezone);
|
| - timezoneList->Append(Value::CreateStringValue(value));
|
| + ListValue* option = new ListValue();
|
| + option->Append(Value::CreateStringValue(GetTimezoneID(timezone)));
|
| + option->Append(Value::CreateStringValue(GetTimezoneName(timezone)));
|
| + timezoneList->Append(option);
|
| }
|
| return timezoneList;
|
| }
|
|
|