| Index: chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
|
| diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
|
| index aef8774e8ace3f8bbe91abce7a6d02a965d80787..c452aa75bec1ecd5568d317375810bbdebb5052e 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
|
| +++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc
|
| @@ -185,12 +185,12 @@ SystemSettingsProvider::SystemSettingsProvider() {
|
| timezones_.push_back(icu::TimeZone::createTimeZone(
|
| icu::UnicodeString(kTimeZones[i], -1, US_INV)));
|
| }
|
| - SystemAccess::GetInstance()->AddObserver(this);
|
| + system::TimezoneSettings::GetInstance()->AddObserver(this);
|
|
|
| }
|
|
|
| SystemSettingsProvider::~SystemSettingsProvider() {
|
| - SystemAccess::GetInstance()->RemoveObserver(this);
|
| + system::TimezoneSettings::GetInstance()->RemoveObserver(this);
|
| STLDeleteElements(&timezones_);
|
| }
|
|
|
| @@ -207,7 +207,7 @@ void SystemSettingsProvider::DoSet(const std::string& path, Value* in_value) {
|
| const icu::TimeZone* timezone = GetTimezone(value);
|
| if (!timezone)
|
| return;
|
| - SystemAccess::GetInstance()->SetTimezone(*timezone);
|
| + system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
|
| }
|
| }
|
|
|
| @@ -215,7 +215,7 @@ bool SystemSettingsProvider::Get(const std::string& path,
|
| Value** out_value) const {
|
| if (path == kSystemTimezone) {
|
| *out_value = Value::CreateStringValue(GetKnownTimezoneID(
|
| - SystemAccess::GetInstance()->GetTimezone()));
|
| + system::TimezoneSettings::GetInstance()->GetTimezone()));
|
| return true;
|
| }
|
| return false;
|
|
|