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

Side by Side Diff: ui/compositor/test/test_compositor_host_ozone.cc

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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/compositor/test/test_compositor_host.h" 5 #include "ui/compositor/test/test_compositor_host.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/thread_task_runner_handle.h"
14 #include "ui/compositor/compositor.h" 14 #include "ui/compositor/compositor.h"
15 #include "ui/gfx/rect.h" 15 #include "ui/gfx/rect.h"
16 16
17 namespace ui { 17 namespace ui {
18 18
19 class TestCompositorHostOzone : public TestCompositorHost { 19 class TestCompositorHostOzone : public TestCompositorHost {
20 public: 20 public:
21 TestCompositorHostOzone(const gfx::Rect& bounds, 21 TestCompositorHostOzone(const gfx::Rect& bounds,
22 ui::ContextFactory* context_factory); 22 ui::ContextFactory* context_factory);
23 virtual ~TestCompositorHostOzone(); 23 virtual ~TestCompositorHostOzone();
24 24
25 private: 25 private:
26 // Overridden from TestCompositorHost: 26 // Overridden from TestCompositorHost:
27 virtual void Show() OVERRIDE; 27 virtual void Show() override;
28 virtual ui::Compositor* GetCompositor() OVERRIDE; 28 virtual ui::Compositor* GetCompositor() override;
29 29
30 gfx::Rect bounds_; 30 gfx::Rect bounds_;
31 31
32 ui::ContextFactory* context_factory_; 32 ui::ContextFactory* context_factory_;
33 33
34 scoped_ptr<ui::Compositor> compositor_; 34 scoped_ptr<ui::Compositor> compositor_;
35 35
36 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostOzone); 36 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostOzone);
37 }; 37 };
38 38
(...skipping 24 matching lines...) Expand all
63 } 63 }
64 64
65 // static 65 // static
66 TestCompositorHost* TestCompositorHost::Create( 66 TestCompositorHost* TestCompositorHost::Create(
67 const gfx::Rect& bounds, 67 const gfx::Rect& bounds,
68 ui::ContextFactory* context_factory) { 68 ui::ContextFactory* context_factory) {
69 return new TestCompositorHostOzone(bounds, context_factory); 69 return new TestCompositorHostOzone(bounds, context_factory);
70 } 70 }
71 71
72 } // namespace ui 72 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/test/test_compositor_host_mac.mm ('k') | ui/compositor/test/test_compositor_host_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698