| Index: chromeos/settings/timezone_settings.h
|
| diff --git a/chromeos/settings/timezone_settings.h b/chromeos/settings/timezone_settings.h
|
| index 7ab0084b00837088d2105591192a15695933747e..b504cc66d35ac645ae2482b10cded028dffe13fb 100644
|
| --- a/chromeos/settings/timezone_settings.h
|
| +++ b/chromeos/settings/timezone_settings.h
|
| @@ -42,7 +42,8 @@ class CHROMEOS_EXPORT TimezoneSettings {
|
| virtual void AddObserver(Observer* observer) = 0;
|
| virtual void RemoveObserver(Observer* observer) = 0;
|
|
|
| - virtual const std::vector<icu::TimeZone*>& GetTimezoneList() const = 0;
|
| + virtual const std::vector<std::unique_ptr<icu::TimeZone>>& GetTimezoneList()
|
| + const = 0;
|
|
|
| // Gets timezone ID which is also used as timezone pref value.
|
| static base::string16 GetTimezoneID(const icu::TimeZone& timezone);
|
|
|