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

Side by Side Diff: Source/platform/scroll/ScrollbarThemeMock.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) 2011 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2011 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 15 matching lines...) Expand all
26 #ifndef ScrollbarThemeMock_h 26 #ifndef ScrollbarThemeMock_h
27 #define ScrollbarThemeMock_h 27 #define ScrollbarThemeMock_h
28 28
29 #include "platform/scroll/ScrollbarTheme.h" 29 #include "platform/scroll/ScrollbarTheme.h"
30 30
31 namespace blink { 31 namespace blink {
32 32
33 // Scrollbar theme used in image snapshots, to eliminate appearance differences between platforms. 33 // Scrollbar theme used in image snapshots, to eliminate appearance differences between platforms.
34 class PLATFORM_EXPORT ScrollbarThemeMock : public ScrollbarTheme { 34 class PLATFORM_EXPORT ScrollbarThemeMock : public ScrollbarTheme {
35 public: 35 public:
36 virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar) OVER RIDE; 36 virtual int scrollbarThickness(ScrollbarControlSize = RegularScrollbar) over ride;
37 virtual bool usesOverlayScrollbars() const OVERRIDE; 37 virtual bool usesOverlayScrollbars() const override;
38 38
39 protected: 39 protected:
40 virtual bool hasButtons(ScrollbarThemeClient*) OVERRIDE { return false; } 40 virtual bool hasButtons(ScrollbarThemeClient*) override { return false; }
41 virtual bool hasThumb(ScrollbarThemeClient*) OVERRIDE { return true; } 41 virtual bool hasThumb(ScrollbarThemeClient*) override { return true; }
42 42
43 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool /* painting*/ = false) OVERRIDE { return IntRect(); } 43 virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool /* painting*/ = false) override { return IntRect(); }
44 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool /*painting*/ = false) OVERRIDE { return IntRect(); } 44 virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool /*painting*/ = false) override { return IntRect(); }
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 paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRe ct&) OVERRIDE; 48 virtual void paintThumb(GraphicsContext*, ScrollbarThemeClient*, const IntRe ct&) override;
49 49
50 private: 50 private:
51 virtual bool isMockTheme() const OVERRIDE FINAL { return true; } 51 virtual bool isMockTheme() const override FINAL { return true; }
52 }; 52 };
53 53
54 } 54 }
55 #endif // ScrollbarThemeMock_h 55 #endif // ScrollbarThemeMock_h
OLDNEW
« no previous file with comments | « Source/platform/scroll/ScrollbarThemeMacOverlayAPI.h ('k') | Source/platform/scroll/ScrollbarThemeNonMacCommon.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698