chrome/browser/content_settings/content_settings_override_provider.h - Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]*

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/content_settings_override_provider.h

Issue 625113002: replace OVERRIDE and FINAL with override and final in chrome/browser/[a-i]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix newly added OVERRIDEs Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/content_settings/content_settings_mock_provider.h ('k') | chrome/browser/content_settings/content_settings_override_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_override_provider.h

diff --git a/chrome/browser/content_settings/content_settings_override_provider.h b/chrome/browser/content_settings/content_settings_override_provider.h

index bcbd3eee61d7e2fc17696a5be999aca445402232..38d8eb186b921cf825629efb052f2f6c7041867d 100644

--- a/chrome/browser/content_settings/content_settings_override_provider.h

+++ b/chrome/browser/content_settings/content_settings_override_provider.h

@@ -33,19 +33,19 @@ class OverrideProvider : public ProviderInterface {

virtual RuleIterator* GetRuleIterator(

ContentSettingsType content_type,

const ResourceIdentifier& resource_identifier,

- bool incognito) const OVERRIDE;

+ bool incognito) const override;

virtual void ClearAllContentSettingsRules(

- ContentSettingsType content_type) OVERRIDE;

+ ContentSettingsType content_type) 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 ShutdownOnUIThread() OVERRIDE;

+ virtual void ShutdownOnUIThread() override;

// Sets if a given |content_type| is |enabled|.

void SetOverrideSetting(ContentSettingsType content_type, bool enabled);