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

Side by Side Diff: ui/compositor/test/test_compositor_host_win.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
10 #include "ui/compositor/compositor.h" 10 #include "ui/compositor/compositor.h"
(...skipping 11 matching lines...) Expand all
22 context_factory, 22 context_factory,
23 base::ThreadTaskRunnerHandle::Get())); 23 base::ThreadTaskRunnerHandle::Get()));
24 compositor_->SetScaleAndSize(1.0f, GetSize()); 24 compositor_->SetScaleAndSize(1.0f, GetSize());
25 } 25 }
26 26
27 virtual ~TestCompositorHostWin() { 27 virtual ~TestCompositorHostWin() {
28 DestroyWindow(hwnd()); 28 DestroyWindow(hwnd());
29 } 29 }
30 30
31 // Overridden from TestCompositorHost: 31 // Overridden from TestCompositorHost:
32 virtual void Show() OVERRIDE { 32 virtual void Show() override {
33 ShowWindow(hwnd(), SW_SHOWNORMAL); 33 ShowWindow(hwnd(), SW_SHOWNORMAL);
34 } 34 }
35 virtual ui::Compositor* GetCompositor() OVERRIDE { 35 virtual ui::Compositor* GetCompositor() override {
36 return compositor_.get(); 36 return compositor_.get();
37 } 37 }
38 38
39 private: 39 private:
40 CR_BEGIN_MSG_MAP_EX(TestCompositorHostWin) 40 CR_BEGIN_MSG_MAP_EX(TestCompositorHostWin)
41 CR_MSG_WM_PAINT(OnPaint) 41 CR_MSG_WM_PAINT(OnPaint)
42 CR_END_MSG_MAP() 42 CR_END_MSG_MAP()
43 43
44 void OnPaint(HDC dc) { 44 void OnPaint(HDC dc) {
45 compositor_->ScheduleFullRedraw(); 45 compositor_->ScheduleFullRedraw();
(...skipping 11 matching lines...) Expand all
57 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostWin); 57 DISALLOW_COPY_AND_ASSIGN(TestCompositorHostWin);
58 }; 58 };
59 59
60 TestCompositorHost* TestCompositorHost::Create( 60 TestCompositorHost* TestCompositorHost::Create(
61 const gfx::Rect& bounds, 61 const gfx::Rect& bounds,
62 ui::ContextFactory* context_factory) { 62 ui::ContextFactory* context_factory) {
63 return new TestCompositorHostWin(bounds, context_factory); 63 return new TestCompositorHostWin(bounds, context_factory);
64 } 64 }
65 65
66 } // namespace ui 66 } // namespace ui
OLDNEW
« no previous file with comments | « ui/compositor/test/test_compositor_host_ozone.cc ('k') | ui/compositor/test/test_compositor_host_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698