diff options
author | dcheng <dcheng@chromium.org> | 2014-10-21 02:51:08 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-21 09:51:37 +0000 |
commit | 716bedf160f4c4c1945cab54c3f490424a0eb779 (patch) | |
tree | c9592751a48527e3278a8a1e001b0569c97ff1d5 /cc/layers/heads_up_display_unittest.cc | |
parent | 6c879fbd35d14af9ca4fe53bc622edac2d3fd5f1 (diff) | |
download | chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.zip chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.gz chromium_src-716bedf160f4c4c1945cab54c3f490424a0eb779.tar.bz2 |
Standardize usage of virtual/override/final in cc/
BUG=417463
TBR=enne@chromium.org
Review URL: https://codereview.chromium.org/645853008
Cr-Commit-Position: refs/heads/master@{#300439}
Diffstat (limited to 'cc/layers/heads_up_display_unittest.cc')
-rw-r--r-- | cc/layers/heads_up_display_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cc/layers/heads_up_display_unittest.cc b/cc/layers/heads_up_display_unittest.cc index 37d40a8..312e482 100644 --- a/cc/layers/heads_up_display_unittest.cc +++ b/cc/layers/heads_up_display_unittest.cc @@ -12,7 +12,7 @@ namespace { class HeadsUpDisplayTest : public LayerTreeTest { protected: - virtual void InitializeSettings(LayerTreeSettings* settings) override { + void InitializeSettings(LayerTreeSettings* settings) override { // Enable the HUD without requiring text. settings->initial_debug_state.show_property_changed_rects = true; } @@ -23,11 +23,11 @@ class DrawsContentLayer : public Layer { static scoped_refptr<DrawsContentLayer> Create() { return make_scoped_refptr(new DrawsContentLayer()); } - virtual bool DrawsContent() const override { return true; } + bool DrawsContent() const override { return true; } private: DrawsContentLayer() : Layer() {} - virtual ~DrawsContentLayer() {} + ~DrawsContentLayer() override {} }; class HudWithRootLayerChange : public HeadsUpDisplayTest { @@ -37,14 +37,14 @@ class HudWithRootLayerChange : public HeadsUpDisplayTest { root_layer2_(DrawsContentLayer::Create()), num_commits_(0) {} - virtual void BeginTest() override { + void BeginTest() override { root_layer1_->SetBounds(gfx::Size(30, 30)); root_layer2_->SetBounds(gfx::Size(30, 30)); PostSetNeedsCommitToMainThread(); } - virtual void DidCommit() override { + void DidCommit() override { ++num_commits_; ASSERT_TRUE(layer_tree_host()->hud_layer()); @@ -86,7 +86,7 @@ class HudWithRootLayerChange : public HeadsUpDisplayTest { } } - virtual void AfterTest() override {} + void AfterTest() override {} private: scoped_refptr<DrawsContentLayer> root_layer1_; |