| Index: chrome/browser/chromeos/settings/system_settings_provider.h
|
| ===================================================================
|
| --- chrome/browser/chromeos/settings/system_settings_provider.h (revision 154482)
|
| +++ chrome/browser/chromeos/settings/system_settings_provider.h (working copy)
|
| @@ -30,6 +30,7 @@
|
| virtual TrustedStatus PrepareTrustedValues(
|
| const base::Closure& callback) OVERRIDE;
|
| virtual bool HandlesSetting(const std::string& path) const OVERRIDE;
|
| + virtual void Reload() OVERRIDE;
|
|
|
| // TimezoneSettings::Observer implementation.
|
| virtual void TimezoneChanged(const icu::TimeZone& timezone) OVERRIDE;
|
|
|
| Property changes on: chrome/browser/chromeos/settings/system_settings_provider.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|