Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chromeos / settings / timezone_settings.cc

diff --git a/src/chromeos/settings/timezone_settings.cc b/src/chromeos/settings/timezone_settings.cc
index 1adcf13..8a2d6a8 100644 (file)
--- a/src/chromeos/settings/timezone_settings.cc
+++ b/src/chromeos/settings/timezone_settings.cc
@@ -7,8 +7,8 @@
 #include <string>
 
 #include "base/bind.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ -49,15 +49,18 @@ static const char* kTimeZones[] = {
     "America/Vancouver",
     "America/Tijuana",
     "America/Phoenix",
+    "America/Chihuahua",
     "America/Denver",
     "America/Edmonton",
-    "America/Chihuahua",
+    "America/Mazatlan",
     "America/Regina",
     "America/Costa_Rica",
     "America/Chicago",
     "America/Mexico_City",
     "America/Winnipeg",
+    "Pacific/Easter",
     "America/Bogota",
+    "America/Lima",
     "America/New_York",
     "America/Toronto",
     "America/Caracas",
@@ -66,27 +69,37 @@ static const char* kTimeZones[] = {
     "America/Manaus",
     "America/Santiago",
     "America/St_Johns",
-    "America/Sao_Paulo",
     "America/Araguaina",
     "America/Argentina/Buenos_Aires",
     "America/Argentina/San_Luis",
+    "America/Sao_Paulo",
     "America/Montevideo",
     "America/Godthab",
     "Atlantic/South_Georgia",
     "Atlantic/Cape_Verde",
     "Atlantic/Azores",
+    "Atlantic/Reykjavik",
+    "Atlantic/St_Helena",
     "Africa/Casablanca",
-    "Europe/London",
+    "Atlantic/Faroe",
     "Europe/Dublin",
+    "Europe/Lisbon",
+    "Europe/London",
     "Europe/Amsterdam",
     "Europe/Belgrade",
     "Europe/Berlin",
     "Europe/Brussels",
+    "Europe/Budapest",
+    "Europe/Copenhagen",
+    "Europe/Ljubljana",
     "Europe/Madrid",
+    "Europe/Oslo",
     "Europe/Paris",
+    "Europe/Prague",
     "Europe/Rome",
     "Europe/Stockholm",
     "Europe/Sarajevo",
+    "Europe/Tirane",
     "Europe/Vienna",
     "Europe/Warsaw",
     "Europe/Zurich",
@@ -97,18 +110,28 @@ static const char* kTimeZones[] = {
     "Africa/Harare",
     "Africa/Maputo",
     "Africa/Johannesburg",
-    "Europe/Helsinki",
+    "Europe/Kaliningrad",
     "Europe/Athens",
+    "Europe/Bucharest",
+    "Europe/Chisinau",
+    "Europe/Helsinki",
+    "Europe/Istanbul",
+    "Europe/Kiev",
+    "Europe/Riga",
+    "Europe/Sofia",
+    "Europe/Tallinn",
+    "Europe/Vilnius",
     "Asia/Amman",
     "Asia/Beirut",
     "Asia/Jerusalem",
-    "Europe/Minsk",
+    "Africa/Nairobi",
     "Asia/Baghdad",
     "Asia/Riyadh",
     "Asia/Kuwait",
-    "Africa/Nairobi",
-    "Asia/Tehran",
+    "Europe/Minsk",
     "Europe/Moscow",
+    "Asia/Tehran",
+    "Europe/Samara",
     "Asia/Dubai",
     "Asia/Tbilisi",
     "Indian/Mauritius",
@@ -118,17 +141,22 @@ static const char* kTimeZones[] = {
     "Asia/Karachi",
     "Asia/Ashgabat",
     "Asia/Oral",
+    "Asia/Yekaterinburg",
     "Asia/Calcutta",
     "Asia/Colombo",
     "Asia/Katmandu",
-    "Asia/Yekaterinburg",
+    "Asia/Omsk",
     "Asia/Almaty",
     "Asia/Dhaka",
+    "Asia/Novosibirsk",
     "Asia/Rangoon",
     "Asia/Bangkok",
     "Asia/Jakarta",
-    "Asia/Omsk",
-    "Asia/Novosibirsk",
+    "Asia/Krasnoyarsk",
+    "Asia/Novokuznetsk",
+    "Asia/Ho_Chi_Minh",
+    "Asia/Phnom_Penh",
+    "Asia/Vientiane",
     "Asia/Shanghai",
     "Asia/Hong_Kong",
     "Asia/Kuala_Lumpur",
@@ -136,27 +164,28 @@ static const char* kTimeZones[] = {
     "Asia/Manila",
     "Asia/Taipei",
     "Asia/Makassar",
-    "Asia/Krasnoyarsk",
+    "Asia/Irkutsk",
+    "Asia/Yakutsk",
     "Australia/Perth",
     "Australia/Eucla",
-    "Asia/Irkutsk",
     "Asia/Seoul",
     "Asia/Tokyo",
     "Asia/Jayapura",
-    "Australia/Adelaide",
+    "Asia/Sakhalin",
+    "Asia/Vladivostok",
+    "Asia/Magadan",
     "Australia/Darwin",
+    "Australia/Adelaide",
+    "Pacific/Guam",
     "Australia/Brisbane",
     "Australia/Hobart",
     "Australia/Sydney",
-    "Asia/Yakutsk",
-    "Pacific/Guam",
+    "Asia/Anadyr",
     "Pacific/Port_Moresby",
-    "Asia/Vladivostok",
-    "Asia/Sakhalin",
-    "Asia/Magadan",
-    "Pacific/Auckland",
+    "Asia/Kamchatka",
     "Pacific/Fiji",
     "Pacific/Majuro",
+    "Pacific/Auckland",
     "Pacific/Tongatapu",
     "Pacific/Apia",
     "Pacific/Kiritimati",
@@ -230,8 +259,8 @@ class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings {
 
   // TimezoneSettings implementation:
   virtual const icu::TimeZone& GetTimezone() OVERRIDE;
-  virtual string16 GetCurrentTimezoneID() OVERRIDE;
-  virtual void SetTimezoneFromID(const string16& timezone_id) OVERRIDE;
+  virtual base::string16 GetCurrentTimezoneID() OVERRIDE;
+  virtual void SetTimezoneFromID(const base::string16& timezone_id) OVERRIDE;
   virtual void AddObserver(Observer* observer) OVERRIDE;
   virtual void RemoveObserver(Observer* observer) OVERRIDE;
   virtual const std::vector<icu::TimeZone*>& GetTimezoneList() const OVERRIDE;
@@ -297,11 +326,12 @@ const icu::TimeZone& TimezoneSettingsBaseImpl::GetTimezone() {
   return *timezone_.get();
 }
 
-string16 TimezoneSettingsBaseImpl::GetCurrentTimezoneID() {
+base::string16 TimezoneSettingsBaseImpl::GetCurrentTimezoneID() {
   return chromeos::system::TimezoneSettings::GetTimezoneID(GetTimezone());
 }
 
-void TimezoneSettingsBaseImpl::SetTimezoneFromID(const string16& timezone_id) {
+void TimezoneSettingsBaseImpl::SetTimezoneFromID(
+    const base::string16& timezone_id) {
   scoped_ptr<icu::TimeZone> timezone(icu::TimeZone::createTimeZone(
       icu::UnicodeString(timezone_id.c_str(), timezone_id.size())));
   SetTimezone(*timezone);
@@ -351,7 +381,7 @@ void TimezoneSettingsImpl::SetTimezone(const icu::TimeZone& timezone) {
     known_timezone = &timezone;
 
   timezone_.reset(known_timezone->clone());
-  std::string id = UTF16ToUTF8(GetTimezoneID(*known_timezone));
+  std::string id = base::UTF16ToUTF8(GetTimezoneID(*known_timezone));
   VLOG(1) << "Setting timezone to " << id;
   // It's safe to change the timezone config files in the background as the
   // following operations don't depend on the completion of the config change.
@@ -430,10 +460,10 @@ TimezoneSettings* TimezoneSettings::GetInstance() {
 }
 
 // static
-string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
+base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) {
   icu::UnicodeString id;
   timezone.getID(id);
-  return string16(id.getBuffer(), id.length());
+  return base::string16(id.getBuffer(), id.length());
 }
 
 }  // namespace system