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

Unified Diff: cc/layers/heads_up_display_unittest.cc

Issue 645853008: Standardize usage of virtual/override/final in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Formatted 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 | « cc/layers/heads_up_display_layer_impl.h ('k') | cc/layers/image_layer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/heads_up_display_unittest.cc
diff --git a/cc/layers/heads_up_display_unittest.cc b/cc/layers/heads_up_display_unittest.cc
index 37d40a87078e9c813c31d775f5ff065e6bff8ada..312e482ff2db281c2ca06fc7733c402535ebe45b 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_;
« no previous file with comments | « cc/layers/heads_up_display_layer_impl.h ('k') | cc/layers/image_layer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698