ui/base/resource/data_pack.h - Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/

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: ui/base/resource/data_pack.h

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

Patch Set: rebase on master 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

Index: ui/base/resource/data_pack.h

diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h

index 2eeb1b2183e022d85a477037e317e2f84be7f67b..70cf242f31b25db19e68f3595b786505085b3e9b 100644

--- a/ui/base/resource/data_pack.h

+++ b/ui/base/resource/data_pack.h

@@ -51,13 +51,13 @@ class UI_BASE_EXPORT DataPack : public ResourceHandle {

TextEncodingType textEncodingType);

// ResourceHandle implementation:

- virtual bool HasResource(uint16 resource_id) const OVERRIDE;

+ virtual bool HasResource(uint16 resource_id) const override;

virtual bool GetStringPiece(uint16 resource_id,

- base::StringPiece* data) const OVERRIDE;

+ base::StringPiece* data) const override;

virtual base::RefCountedStaticMemory* GetStaticMemory(

- uint16 resource_id) const OVERRIDE;

- virtual TextEncodingType GetTextEncodingType() const OVERRIDE;

- virtual ui::ScaleFactor GetScaleFactor() const OVERRIDE;

+ uint16 resource_id) const override;

+ virtual TextEncodingType GetTextEncodingType() const override;

+ virtual ui::ScaleFactor GetScaleFactor() const override;

private:

// Does the actual loading of a pack file. Called by Load and LoadFromFile.

« no previous file with comments | « ui/base/models/tree_node_model_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »