ui/compositor/test/draw_waiter_for_test.h - Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/compositor/test/draw_waiter_for_test.h

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

« no previous file with comments | « ui/compositor/scoped_layer_animation_settings.cc ('k') | ui/compositor/test/in_process_context_factory.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 #ifndef UI_COMPOSITOR_TEST_DRAW_WAITER_H_	5 #ifndef UI_COMPOSITOR_TEST_DRAW_WAITER_H_

6 #define UI_COMPOSITOR_TEST_DRAW_WAITER_H_	6 #define UI_COMPOSITOR_TEST_DRAW_WAITER_H_

7	7

8 #include "base/run_loop.h"	8 #include "base/run_loop.h"

9 #include "ui/compositor/compositor_observer.h"	9 #include "ui/compositor/compositor_observer.h"

10	10

(...skipping 23 matching lines...) Expand all Loading...
34 WAIT_FOR_COMPOSITING_STARTED,	34 WAIT_FOR_COMPOSITING_STARTED,

35 WAIT_FOR_COMPOSITING_ENDED,	35 WAIT_FOR_COMPOSITING_ENDED,

36 };	36 };

37	37

38 DrawWaiterForTest(WaitEvent wait_event);	38 DrawWaiterForTest(WaitEvent wait_event);

39 virtual ~DrawWaiterForTest();	39 virtual ~DrawWaiterForTest();

40	40

41 void WaitImpl(Compositor* compositor);	41 void WaitImpl(Compositor* compositor);

42	42

43 // CompositorObserver implementation.	43 // CompositorObserver implementation.

44 virtual void OnCompositingDidCommit(Compositor* compositor) OVERRIDE;	44 virtual void OnCompositingDidCommit(Compositor* compositor) override;

45 virtual void OnCompositingStarted(Compositor* compositor,	45 virtual void OnCompositingStarted(Compositor* compositor,

46 base::TimeTicks start_time) OVERRIDE;	46 base::TimeTicks start_time) override;

47 virtual void OnCompositingEnded(Compositor* compositor) OVERRIDE;	47 virtual void OnCompositingEnded(Compositor* compositor) override;

48 virtual void OnCompositingAborted(Compositor* compositor) OVERRIDE;	48 virtual void OnCompositingAborted(Compositor* compositor) override;

49 virtual void OnCompositingLockStateChanged(Compositor* compositor) OVERRIDE;	49 virtual void OnCompositingLockStateChanged(Compositor* compositor) override;

50	50

51 scoped_ptr<base::RunLoop> wait_run_loop_;	51 scoped_ptr<base::RunLoop> wait_run_loop_;

52	52

53 WaitEvent wait_event_;	53 WaitEvent wait_event_;

54	54

55 DISALLOW_COPY_AND_ASSIGN(DrawWaiterForTest);	55 DISALLOW_COPY_AND_ASSIGN(DrawWaiterForTest);

56 };	56 };

57	57

58 } // namespace ui	58 } // namespace ui

59	59

60 #endif // UI_COMPOSITOR_TEST_DRAW_WAITER_H_	60 #endif // UI_COMPOSITOR_TEST_DRAW_WAITER_H_

OLD	NEW