Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(222)

Unified Diff: ui/base/resource/data_pack.h

Issue 667923002: Standardize usage of virtual/override/final in ui/ (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 | « ui/base/models/tree_node_model_unittest.cc ('k') | ui/base/resource/resource_bundle.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/data_pack.h
diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h
index 70cf242f31b25db19e68f3595b786505085b3e9b..928c855afa639041d81c75c70ad601aafd7c91f2 100644
--- a/ui/base/resource/data_pack.h
+++ b/ui/base/resource/data_pack.h
@@ -30,7 +30,7 @@ namespace ui {
class UI_BASE_EXPORT DataPack : public ResourceHandle {
public:
DataPack(ui::ScaleFactor scale_factor);
- virtual ~DataPack();
+ ~DataPack() override;
// Load a pack file from |path|, returning false on error.
bool LoadFromPath(const base::FilePath& path);
@@ -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 GetStringPiece(uint16 resource_id,
- base::StringPiece* data) const override;
- virtual base::RefCountedStaticMemory* GetStaticMemory(
+ bool HasResource(uint16 resource_id) const override;
+ bool GetStringPiece(uint16 resource_id,
+ base::StringPiece* data) const override;
+ base::RefCountedStaticMemory* GetStaticMemory(
uint16 resource_id) const override;
- virtual TextEncodingType GetTextEncodingType() const override;
- virtual ui::ScaleFactor GetScaleFactor() const override;
+ TextEncodingType GetTextEncodingType() const override;
+ 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 »

Powered by Google App Engine
This is Rietveld 408576698