diff options
author | mostynb <mostynb@opera.com> | 2014-10-06 11:07:37 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 18:07:51 +0000 |
commit | f68776d8c52601899d957c7ac222693fd51405d2 (patch) | |
tree | e769b135b24375bf55447c1c4638a99927e4d98c /cc/trees/layer_tree_host_unittest_proxy.cc | |
parent | ee4b857ca20186868aad7a5b22fc454a11b6fe86 (diff) | |
download | chromium_src-f68776d8c52601899d957c7ac222693fd51405d2.zip chromium_src-f68776d8c52601899d957c7ac222693fd51405d2.tar.gz chromium_src-f68776d8c52601899d957c7ac222693fd51405d2.tar.bz2 |
replace OVERRIDE and FINAL with override and final in cc/
BUG=417463
Review URL: https://codereview.chromium.org/628443002
Cr-Commit-Position: refs/heads/master@{#298271}
Diffstat (limited to 'cc/trees/layer_tree_host_unittest_proxy.cc')
-rw-r--r-- | cc/trees/layer_tree_host_unittest_proxy.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cc/trees/layer_tree_host_unittest_proxy.cc b/cc/trees/layer_tree_host_unittest_proxy.cc index 4f79311..5993479 100644 --- a/cc/trees/layer_tree_host_unittest_proxy.cc +++ b/cc/trees/layer_tree_host_unittest_proxy.cc @@ -37,8 +37,8 @@ class ProxyTest : public LayerTreeTest { RunTest(threaded, delegating_renderer, impl_side_painting); } - virtual void BeginTest() OVERRIDE {} - virtual void AfterTest() OVERRIDE {} + virtual void BeginTest() override {} + virtual void AfterTest() override {} private: DISALLOW_COPY_AND_ASSIGN(ProxyTest); @@ -46,28 +46,28 @@ class ProxyTest : public LayerTreeTest { class ProxyTestScheduledActionsBasic : public ProxyTest { protected: - virtual void BeginTest() OVERRIDE { + virtual void BeginTest() override { proxy()->SetNeedsCommit(); } - virtual void ScheduledActionBeginOutputSurfaceCreation() OVERRIDE { + virtual void ScheduledActionBeginOutputSurfaceCreation() override { EXPECT_EQ(0, action_phase_++); } - virtual void ScheduledActionSendBeginMainFrame() OVERRIDE { + virtual void ScheduledActionSendBeginMainFrame() override { EXPECT_EQ(1, action_phase_++); } - virtual void ScheduledActionCommit() OVERRIDE { + virtual void ScheduledActionCommit() override { EXPECT_EQ(2, action_phase_++); } - virtual void ScheduledActionDrawAndSwapIfPossible() OVERRIDE { + virtual void ScheduledActionDrawAndSwapIfPossible() override { EXPECT_EQ(3, action_phase_++); EndTest(); } - virtual void AfterTest() OVERRIDE { + virtual void AfterTest() override { EXPECT_EQ(4, action_phase_); } @@ -109,7 +109,7 @@ class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest { ThreadProxyTestSetNeedsCommit() {} virtual ~ThreadProxyTestSetNeedsCommit() {} - virtual void BeginTest() OVERRIDE { + virtual void BeginTest() override { EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); @@ -119,7 +119,7 @@ class ThreadProxyTestSetNeedsCommit : public ThreadProxyTest { EXPECT_TRUE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); } - virtual void DidBeginMainFrame() OVERRIDE { + virtual void DidBeginMainFrame() override { EXPECT_FALSE(ThreadProxyMainOnly().commit_requested); EXPECT_FALSE(ThreadProxyMainOnly().commit_request_sent_to_impl_thread); |