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

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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.	2 * Copyright (C) 2008 Apple 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 * 1. Redistributions of source code must retain the above copyright	7 * 1. Redistributions of source code must retain the above copyright

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

9 * 2. Redistributions in binary form must reproduce the above copyright	9 * 2. Redistributions in binary form must reproduce the above copyright

10 * notice, this list of conditions and the following disclaimer in the	10 * notice, this list of conditions and the following disclaimer in the

(...skipping 19 matching lines...) Expand all Loading...
30 #include "platform/scroll/ScrollbarTheme.h"	30 #include "platform/scroll/ScrollbarTheme.h"

31	31

32 namespace blink {	32 namespace blink {

33	33

34 class Pattern;	34 class Pattern;

35	35

36 class PLATFORM_EXPORT ScrollbarThemeMacCommon : public ScrollbarTheme {	36 class PLATFORM_EXPORT ScrollbarThemeMacCommon : public ScrollbarTheme {

37 public:	37 public:

38 virtual ~ScrollbarThemeMacCommon();	38 virtual ~ScrollbarThemeMacCommon();

39	39

40 virtual void registerScrollbar(ScrollbarThemeClient*) OVERRIDE;	40 virtual void registerScrollbar(ScrollbarThemeClient*) override;

41 virtual void unregisterScrollbar(ScrollbarThemeClient*) OVERRIDE;	41 virtual void unregisterScrollbar(ScrollbarThemeClient*) override;

42 void preferencesChanged(float initialButtonDelay, float autoscrollButtonDela y, NSScrollerStyle preferredScrollerStyle, bool redraw);	42 void preferencesChanged(float initialButtonDelay, float autoscrollButtonDela y, NSScrollerStyle preferredScrollerStyle, bool redraw);

43	43

44 virtual bool supportsControlTints() const OVERRIDE { return true; }	44 virtual bool supportsControlTints() const override { return true; }

45	45

46 virtual double initialAutoscrollTimerDelay() OVERRIDE;	46 virtual double initialAutoscrollTimerDelay() override;

47 virtual double autoscrollTimerDelay() OVERRIDE;	47 virtual double autoscrollTimerDelay() override;

48	48

49 virtual void paintOverhangBackground(GraphicsContext*, const IntRect& horizo ntalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) OVERRIDE;	49 virtual void paintOverhangBackground(GraphicsContext*, const IntRect& horizo ntalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) override;

50 virtual void paintOverhangShadows(GraphicsContext*, const IntSize& scrollOff set, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) OVERRIDE;	50 virtual void paintOverhangShadows(GraphicsContext*, const IntSize& scrollOff set, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect) override;

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

52	52

53 static NSScrollerStyle recommendedScrollerStyle();	53 static NSScrollerStyle recommendedScrollerStyle();

54	54

55 static bool isOverlayAPIAvailable();	55 static bool isOverlayAPIAvailable();

56	56

57 protected:	57 protected:

58 virtual int maxOverlapBetweenPages() OVERRIDE { return 40; }	58 virtual int maxOverlapBetweenPages() override { return 40; }

59	59

60 virtual bool shouldDragDocumentInsteadOfThumb(ScrollbarThemeClient*, const P latformMouseEvent&) OVERRIDE;	60 virtual bool shouldDragDocumentInsteadOfThumb(ScrollbarThemeClient*, const P latformMouseEvent&) override;

61 int scrollbarPartToHIPressedState(ScrollbarPart);	61 int scrollbarPartToHIPressedState(ScrollbarPart);

62	62

63 virtual void updateButtonPlacement() { }	63 virtual void updateButtonPlacement() { }

64	64

65 void paintGivenTickmarks(GraphicsContext, ScrollbarThemeClient, const IntR ect&, const Vector<IntRect>&);	65 void paintGivenTickmarks(GraphicsContext, ScrollbarThemeClient, const IntR ect&, const Vector<IntRect>&);

66	66

67 RefPtr<Pattern> m_overhangPattern;	67 RefPtr<Pattern> m_overhangPattern;

68 };	68 };

69	69

70 }	70 }

71	71

72 #endif // ScrollbarThemeMacCommon_h	72 #endif // ScrollbarThemeMacCommon_h

OLD	NEW