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

Side by Side Diff: Source/platform/scroll/ScrollbarThemeMacOverlayAPI.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 21 matching lines...) Expand all
32 #define ScrollbarThemeMacOverlayAPI_h 32 #define ScrollbarThemeMacOverlayAPI_h
33 33
34 #include "platform/scroll/ScrollbarThemeMacCommon.h" 34 #include "platform/scroll/ScrollbarThemeMacCommon.h"
35 35
36 typedef id ScrollbarPainter; 36 typedef id ScrollbarPainter;
37 37
38 namespace blink { 38 namespace blink {
39 39
40 class PLATFORM_EXPORT ScrollbarThemeMacOverlayAPI : public ScrollbarThemeMacComm on { 40 class PLATFORM_EXPORT ScrollbarThemeMacOverlayAPI : public ScrollbarThemeMacComm on {
41 public: 41 public:
42 virtual void updateEnabledState(ScrollbarThemeClient*) OVERRIDE; 42 virtual void updateEnabledState(ScrollbarThemeClient*) override;
43 virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar) OVER RIDE; 43 virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar) over ride;
44 virtual bool usesOverlayScrollbars() const OVERRIDE; 44 virtual bool usesOverlayScrollbars() const override;
45 virtual void updateScrollbarOverlayStyle(ScrollbarThemeClient*) OVERRIDE; 45 virtual void updateScrollbarOverlayStyle(ScrollbarThemeClient*) override;
46 virtual ScrollbarButtonsPlacement buttonsPlacement() const OVERRIDE; 46 virtual ScrollbarButtonsPlacement buttonsPlacement() const override;
47 47
48 virtual void registerScrollbar(ScrollbarThemeClient*) OVERRIDE; 48 virtual void registerScrollbar(ScrollbarThemeClient*) override;
49 virtual void unregisterScrollbar(ScrollbarThemeClient*) OVERRIDE; 49 virtual void unregisterScrollbar(ScrollbarThemeClient*) override;
50 50
51 void setNewPainterForScrollbar(ScrollbarThemeClient*, ScrollbarPainter); 51 void setNewPainterForScrollbar(ScrollbarThemeClient*, ScrollbarPainter);
52 ScrollbarPainter painterForScrollbar(ScrollbarThemeClient*); 52 ScrollbarPainter painterForScrollbar(ScrollbarThemeClient*);
53 53
54 virtual void paintTrackBackground(GraphicsContext*, ScrollbarThemeClient*, c onst IntRect&) OVERRIDE; 54 virtual void paintTrackBackground(GraphicsContext*, ScrollbarThemeClient*, c onst IntRect&) override;
55 virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRe ct&) OVERRIDE; 55 virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRe ct&) override;
56 56
57 protected: 57 protected:
58 virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) OVER RIDE; 58 virtual IntRect trackRect(ScrollbarThemeClient*, bool painting = false) over ride;
59 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool pa inting = false) OVERRIDE; 59 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool pa inting = false) override;
60 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) OVERRIDE; 60 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false) override;
61 61
62 virtual bool hasButtons(ScrollbarThemeClient*) OVERRIDE { return false; } 62 virtual bool hasButtons(ScrollbarThemeClient*) override { return false; }
63 virtual bool hasThumb(ScrollbarThemeClient*) OVERRIDE; 63 virtual bool hasThumb(ScrollbarThemeClient*) override;
64 64
65 virtual int minimumThumbLength(ScrollbarThemeClient*) OVERRIDE; 65 virtual int minimumThumbLength(ScrollbarThemeClient*) override;
66 }; 66 };
67 67
68 } 68 }
69 69
70 #endif 70 #endif
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollbarThemeMacNonOverlayAPI.h ('k') | Source/platform/scroll/ScrollbarThemeMock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698