Split options page code/html into its own set of files

chrome/browser/chromeos/dom_ui/system_options_handler.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/dom_ui/system_options_handler.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/basictypes.h"
 #include "base/callback.h"
@@ skipping 79 matching lines @@
   localized_strings->SetString(L"language",
       l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE));
   localized_strings->SetString(L"language_customize",
       l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE));
 
   localized_strings->SetString(L"accessibility_title",
       l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY));
   localized_strings->SetString(L"accessibility",
       l10n_util::GetString(IDS_OPTIONS_SETTINGS_ACCESSIBILITY_DESCRIPTION));
 
-  localized_strings->Set(L"timezoneMap", GetTimezoneMap());
+  localized_strings->Set(L"timezoneList", GetTimezoneList());
 }
 
-DictionaryValue* SystemOptionsHandler::GetTimezoneMap() {
-  DictionaryValue* timezoneMap = new DictionaryValue();
+ListValue* SystemOptionsHandler::GetTimezoneList() {
+  ListValue* timezoneList = new ListValue();
   for (std::vector<icu::TimeZone*>::iterator iter = timezones_.begin();
        iter != timezones_.end(); ++iter) {
     const icu::TimeZone* timezone = *iter;
-    timezoneMap->SetString(GetTimezoneID(timezone).c_str(),
-                           GetTimezoneName(timezone));
+    static const std::wstring delimiter(L"|");
+    std::wstring value = GetTimezoneID(timezone);
+    value += delimiter;
+    value += GetTimezoneName(timezone);
+    timezoneList->Append(Value::CreateStringValue(value));
   }
-  return timezoneMap;
+  return timezoneList;
 }
 
-std::string SystemOptionsHandler::GetTimezoneName(
+std::wstring SystemOptionsHandler::GetTimezoneName(
     const icu::TimeZone* timezone) {
   DCHECK(timezone);
   icu::UnicodeString name;
   timezone->getDisplayName(name);
-  std::string output;
-  UTF16ToUTF8(name.getBuffer(), name.length(), &output);
+  std::wstring output;
+  UTF16ToWide(name.getBuffer(), name.length(), &output);
   int hour_offset = timezone->getRawOffset() / 3600000;
-  const char* format;
+  const wchar_t* format;
   if (hour_offset == 0)
-    format = "(GMT) ";
+    format = L"(GMT) ";
   else
-    format = "(GMT%+d) ";
+    format = L"(GMT%+d) ";
 
   return StringPrintf(format, hour_offset) + output;
 }
 
 std::wstring SystemOptionsHandler::GetTimezoneID(
     const icu::TimeZone* timezone) {
   DCHECK(timezone);
   icu::UnicodeString id;
   timezone->getID(id);
   std::wstring output;
   UTF16ToWide(id.getBuffer(), id.length(), &output);
   return output;
 }