| Index: chromeos/settings/timezone_settings.cc
|
| diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc
|
| index 8a2d6a819d73c5c66193d58f3db398f56cbcbee7..1c8f8941977048339c2e163f972d8123ebf4c3fa 100644
|
| --- a/chromeos/settings/timezone_settings.cc
|
| +++ b/chromeos/settings/timezone_settings.cc
|
| @@ -258,12 +258,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 +290,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 +306,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();
|
|
|
|
|