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 39980cceaac29858e061aa0e70063428265e0bf3..359a1930e08cb177cff2eae2c37d2be98607a5c5 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc |
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc |
@@ -214,14 +214,20 @@ void SystemSettingsProvider::DoSet(const std::string& path, Value* in_value) { |
} |
} |
-bool SystemSettingsProvider::Get(const std::string& path, |
- Value** out_value) const { |
+const base::Value* SystemSettingsProvider::Get(const std::string& path) const { |
if (path == kSystemTimezone) { |
- *out_value = Value::CreateStringValue(GetKnownTimezoneID( |
- system::TimezoneSettings::GetInstance()->GetTimezone())); |
- return true; |
+ // TODO(pastarmovj): Cache this in the local_state instead of locally. |
+ system_timezone_.reset(base::Value::CreateStringValue(GetKnownTimezoneID( |
+ system::TimezoneSettings::GetInstance()->GetTimezone()))); |
+ return system_timezone_.get(); |
} |
- return false; |
+ return NULL; |
+} |
+ |
+// The timezone is always trusted. |
+bool SystemSettingsProvider::GetTrusted(const std::string& path, |
+ const base::Closure& callback) const { |
+ return true; |
} |
bool SystemSettingsProvider::HandlesSetting(const std::string& path) const { |