Index: chrome/browser/ui/webui/options/chromeos/system_settings_provider.h |
diff --git a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h |
index 4ac725a2e541c0a7cdc3c223121c675e906586a8..feeced20a862bf3a04d1683894adfe9bc09a3067 100644 |
--- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h |
+++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h |
@@ -30,8 +30,9 @@ class SystemSettingsProvider : public CrosSettingsProvider, |
// CrosSettingsProvider overrides. |
virtual const base::Value* Get(const std::string& path) const OVERRIDE; |
virtual bool GetTrusted(const std::string& path, |
- const base::Closure& callback) const OVERRIDE; |
+ const base::Closure& callback) OVERRIDE; |
virtual bool HandlesSetting(const std::string& path) const OVERRIDE; |
+ virtual void Reload() OVERRIDE; |
// Overridden from TimezoneSettings::Observer: |
virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE; |
@@ -64,8 +65,8 @@ class SystemSettingsProvider : public CrosSettingsProvider, |
// Timezones. |
std::vector<icu::TimeZone*> timezones_; |
- // TODO(pastarmovj): This will be cached in the local_state PrefStore soon. |
- mutable scoped_ptr<base::StringValue> system_timezone_; |
+ |
+ scoped_ptr<base::Value> timezone_value_; |
DISALLOW_COPY_AND_ASSIGN(SystemSettingsProvider); |
}; |