Source/platform/scroll/ScrollbarThemeNonMacCommon.h - Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform

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: Source/platform/scroll/ScrollbarThemeNonMacCommon.h

Issue 630853002: Replacing the OVERRIDE with override in third_party/WebKit/Source/platform (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Rebase build fix 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 | « Source/platform/scroll/ScrollbarThemeMock.h ('k') | Source/platform/scroll/ScrollbarThemeOverlay.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.	2 * Copyright (c) 2008, 2009, Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 19 matching lines...) Expand all Loading...
30	30

31 #ifndef ScrollbarThemeNonMacCommon_h	31 #ifndef ScrollbarThemeNonMacCommon_h

32 #define ScrollbarThemeNonMacCommon_h	32 #define ScrollbarThemeNonMacCommon_h

33	33

34 #include "platform/scroll/ScrollbarTheme.h"	34 #include "platform/scroll/ScrollbarTheme.h"

35	35

36 namespace blink {	36 namespace blink {

37	37

38 class PLATFORM_EXPORT ScrollbarThemeNonMacCommon : public ScrollbarTheme {	38 class PLATFORM_EXPORT ScrollbarThemeNonMacCommon : public ScrollbarTheme {

39 protected:	39 protected:

40 virtual bool hasButtons(ScrollbarThemeClient*) OVERRIDE { return true; }	40 virtual bool hasButtons(ScrollbarThemeClient*) override { return true; }

41 virtual bool hasThumb(ScrollbarThemeClient*) OVERRIDE;	41 virtual bool hasThumb(ScrollbarThemeClient*) override;

42	42

43 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool pa inting = false) OVERRIDE;	43 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool pa inting = false) override;

44 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) OVERRIDE;	44 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;

45 virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) OVER RIDE;	45 virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) over ride;

46	46

47 virtual void paintTrackBackground(GraphicsContext, ScrollbarThemeClient, c onst IntRect&) OVERRIDE;	47 virtual void paintTrackBackground(GraphicsContext, ScrollbarThemeClient, c onst IntRect&) override;

48 virtual void paintTickmarks(GraphicsContext, ScrollbarThemeClient, const I ntRect&) OVERRIDE;	48 virtual void paintTickmarks(GraphicsContext, ScrollbarThemeClient, const I ntRect&) override;

49	49

50 virtual IntSize buttonSize(ScrollbarThemeClient*) = 0;	50 virtual IntSize buttonSize(ScrollbarThemeClient*) = 0;

51 };	51 };

52	52

53 } // namespace blink	53 } // namespace blink

54	54

55 #endif	55 #endif

OLD	NEW