| Index: chrome/browser/content_settings/content_settings_pref_provider.h
|
| diff --git a/chrome/browser/content_settings/content_settings_pref_provider.h b/chrome/browser/content_settings/content_settings_pref_provider.h
|
| index 0c17348dda71aee55f7efd4e0a560b7ac37bae35..00ab98785277eab4ee6c4197b276f50ce93425db 100644
|
| --- a/chrome/browser/content_settings/content_settings_pref_provider.h
|
| +++ b/chrome/browser/content_settings/content_settings_pref_provider.h
|
| @@ -42,19 +42,19 @@ class PrefProvider : public ObservableProvider {
|
| virtual RuleIterator* GetRuleIterator(
|
| ContentSettingsType content_type,
|
| const ResourceIdentifier& resource_identifier,
|
| - bool incognito) const OVERRIDE;
|
| + bool incognito) const override;
|
|
|
| virtual bool SetWebsiteSetting(
|
| const ContentSettingsPattern& primary_pattern,
|
| const ContentSettingsPattern& secondary_pattern,
|
| ContentSettingsType content_type,
|
| const ResourceIdentifier& resource_identifier,
|
| - base::Value* value) OVERRIDE;
|
| + base::Value* value) override;
|
|
|
| virtual void ClearAllContentSettingsRules(
|
| - ContentSettingsType content_type) OVERRIDE;
|
| + ContentSettingsType content_type) override;
|
|
|
| - virtual void ShutdownOnUIThread() OVERRIDE;
|
| + virtual void ShutdownOnUIThread() override;
|
|
|
| // Records the last time the given pattern has used a certain content setting.
|
| void UpdateLastUsage(const ContentSettingsPattern& primary_pattern,
|
|
|