| 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 fe2ae1ecd43c318d180c9eb5715bff0099d12a4d..a94a22ecb93874fbcf9a2d25bddb6be083d1bca3 100644
|
| --- a/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
|
| +++ b/chrome/browser/ui/webui/options/chromeos/system_settings_provider.h
|
| @@ -26,10 +26,12 @@ class SystemSettingsProvider : public CrosSettingsProvider,
|
| virtual ~SystemSettingsProvider();
|
|
|
| // CrosSettingsProvider overrides.
|
| - virtual bool Get(const std::string& path,
|
| - base::Value** out_value) const OVERRIDE;
|
| + virtual const base::Value* Get(const std::string& path) const OVERRIDE;
|
| + virtual bool GetTrusted(const std::string& path,
|
| + const Callback& callback) const OVERRIDE;
|
| virtual bool HandlesSetting(const std::string& path) const OVERRIDE;
|
|
|
| +
|
| // Overridden from TimezoneSettings::Observer:
|
| virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE;
|
|
|
|
|