components/content_settings/core/browser/content_settings_rule.h - Issue 623133002: replace OVERRIDE and FINAL with override and final in components/

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: components/content_settings/core/browser/content_settings_rule.h

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « components/content_settings/core/browser/content_settings_origin_identifier_value_map.cc ('k') | components/content_settings/core/browser/content_settings_rule_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/content_settings/core/browser/content_settings_rule.h

diff --git a/components/content_settings/core/browser/content_settings_rule.h b/components/content_settings/core/browser/content_settings_rule.h

index b8f37cbd34e4cf2631fd37f9f880016c1777bbb9..bff9f652fdc7b0e0b8be734df4f07a05b60b18de 100644

--- a/components/content_settings/core/browser/content_settings_rule.h

+++ b/components/content_settings/core/browser/content_settings_rule.h

@@ -40,8 +40,8 @@ class RuleIterator {

class EmptyRuleIterator : public RuleIterator {

public:

virtual ~EmptyRuleIterator();

- virtual bool HasNext() const OVERRIDE;

- virtual Rule Next() OVERRIDE;

+ virtual bool HasNext() const override;

+ virtual Rule Next() override;

};

class ConcatenationIterator : public RuleIterator {

@@ -51,8 +51,8 @@ class ConcatenationIterator : public RuleIterator {

ConcatenationIterator(ScopedVector<RuleIterator>* iterators,

base::AutoLock* auto_lock);

virtual ~ConcatenationIterator();

- virtual bool HasNext() const OVERRIDE;

- virtual Rule Next() OVERRIDE;

+ virtual bool HasNext() const override;

+ virtual Rule Next() override;

private:

ScopedVector<RuleIterator> iterators_;

scoped_ptr<base::AutoLock> auto_lock_;