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

Side by Side Diff: Source/platform/scroll/ScrollbarThemeOverlay.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/ScrollbarThemeNonMacCommon.h ('k') | Source/platform/scroll/ScrollbarThemeOverlayMock.h » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 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	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 23 matching lines...) Expand all Loading...
34 // This scrollbar theme is used to get overlay scrollbar for platforms other	34 // This scrollbar theme is used to get overlay scrollbar for platforms other

35 // than Mac. Mac's overlay scrollbars are in ScrollbarThemeMac*.	35 // than Mac. Mac's overlay scrollbars are in ScrollbarThemeMac*.

36 class PLATFORM_EXPORT ScrollbarThemeOverlay : public ScrollbarTheme {	36 class PLATFORM_EXPORT ScrollbarThemeOverlay : public ScrollbarTheme {

37 public:	37 public:

38 enum HitTestBehavior { AllowHitTest, DisallowHitTest };	38 enum HitTestBehavior { AllowHitTest, DisallowHitTest };

39	39

40 ScrollbarThemeOverlay(int thumbThickness, int scrollbarMargin, HitTestBehavi or);	40 ScrollbarThemeOverlay(int thumbThickness, int scrollbarMargin, HitTestBehavi or);

41 ScrollbarThemeOverlay(int thumbThickness, int scrollbarMargin, HitTestBehavi or, Color);	41 ScrollbarThemeOverlay(int thumbThickness, int scrollbarMargin, HitTestBehavi or, Color);

42 virtual ~ScrollbarThemeOverlay() { }	42 virtual ~ScrollbarThemeOverlay() { }

43	43

44 virtual int scrollbarThickness(ScrollbarControlSize) OVERRIDE;	44 virtual int scrollbarThickness(ScrollbarControlSize) override;

45 virtual bool usesOverlayScrollbars() const OVERRIDE;	45 virtual bool usesOverlayScrollbars() const override;

46	46

47 virtual int thumbPosition(ScrollbarThemeClient*) OVERRIDE;	47 virtual int thumbPosition(ScrollbarThemeClient*) override;

48 virtual int thumbLength(ScrollbarThemeClient*) OVERRIDE;	48 virtual int thumbLength(ScrollbarThemeClient*) override;

49	49

50 virtual bool hasButtons(ScrollbarThemeClient*) OVERRIDE { return false; };	50 virtual bool hasButtons(ScrollbarThemeClient*) override { return false; };

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

52	52

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

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

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

56 virtual int thumbThickness(ScrollbarThemeClient*) OVERRIDE;	56 virtual int thumbThickness(ScrollbarThemeClient*) override;

57	57

58 virtual void paintThumb(GraphicsContext, ScrollbarThemeClient, const IntRe ct&) OVERRIDE;	58 virtual void paintThumb(GraphicsContext, ScrollbarThemeClient, const IntRe ct&) override;

59 virtual ScrollbarPart hitTest(ScrollbarThemeClient*, const IntPoint&) OVERRI DE;	59 virtual ScrollbarPart hitTest(ScrollbarThemeClient*, const IntPoint&) overri de;

60	60

61 private:	61 private:

62 int m_thumbThickness;	62 int m_thumbThickness;

63 int m_scrollbarMargin;	63 int m_scrollbarMargin;

64 HitTestBehavior m_allowHitTest;	64 HitTestBehavior m_allowHitTest;

65 Color m_color;	65 Color m_color;

66 const bool m_useSolidColor;	66 const bool m_useSolidColor;

67 };	67 };

68	68

69 } // namespace blink	69 } // namespace blink

70	70

71 #endif	71 #endif

OLD	NEW