Update To 11.40.268.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 8a2d6a8..7403b5b 100644 (file)
--- a/src/chromeos/settings/timezone_settings.cc
+++ b/src/chromeos/settings/timezone_settings.cc
@@ -88,11 +88,13 @@ static const char* kTimeZones[] = {
     "Europe/Amsterdam",
     "Europe/Belgrade",
     "Europe/Berlin",
+    "Europe/Bratislava",
     "Europe/Brussels",
     "Europe/Budapest",
     "Europe/Copenhagen",
     "Europe/Ljubljana",
     "Europe/Madrid",
+    "Europe/Malta",
     "Europe/Oslo",
     "Europe/Paris",
     "Europe/Prague",
@@ -100,8 +102,10 @@ static const char* kTimeZones[] = {
     "Europe/Stockholm",
     "Europe/Sarajevo",
     "Europe/Tirane",
+    "Europe/Vaduz",
     "Europe/Vienna",
     "Europe/Warsaw",
+    "Europe/Zagreb",
     "Europe/Zurich",
     "Africa/Windhoek",
     "Africa/Lagos",
@@ -258,12 +262,12 @@ class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings {
   virtual ~TimezoneSettingsBaseImpl();
 
   // TimezoneSettings implementation:
-  virtual const icu::TimeZone& GetTimezone() 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;
+  virtual const icu::TimeZone& GetTimezone() 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;
 
  protected:
   TimezoneSettingsBaseImpl();
@@ -290,7 +294,7 @@ class TimezoneSettingsBaseImpl : public chromeos::system::TimezoneSettings {
 class TimezoneSettingsImpl : public TimezoneSettingsBaseImpl {
  public:
   // TimezoneSettings implementation:
-  virtual void SetTimezone(const icu::TimeZone& timezone) OVERRIDE;
+  virtual void SetTimezone(const icu::TimeZone& timezone) override;
 
   static TimezoneSettingsImpl* GetInstance();
 
@@ -306,7 +310,7 @@ class TimezoneSettingsImpl : public TimezoneSettingsBaseImpl {
 class TimezoneSettingsStubImpl : public TimezoneSettingsBaseImpl {
  public:
   // TimezoneSettings implementation:
-  virtual void SetTimezone(const icu::TimeZone& timezone) OVERRIDE;
+  virtual void SetTimezone(const icu::TimeZone& timezone) override;
 
   static TimezoneSettingsStubImpl* GetInstance();