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

Side by Side Diff: Source/web/WebPluginScrollbarImpl.h

Issue 634893002: Replace OVERRIDE and FINAL with override and final in WebKit/public (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 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/web/WebPluginContainerImpl.h ('k') | Source/web/WebPopupMenuImpl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 * 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
30 #include "wtf/RefPtr.h" 30 #include "wtf/RefPtr.h"
31 #include "wtf/Vector.h" 31 #include "wtf/Vector.h"
32 32
33 namespace blink { 33 namespace blink {
34 34
35 class IntPoint; 35 class IntPoint;
36 class IntRect; 36 class IntRect;
37 class Scrollbar; 37 class Scrollbar;
38 class ScrollbarGroup; 38 class ScrollbarGroup;
39 39
40 class WebPluginScrollbarImpl FINAL : public WebPluginScrollbar { 40 class WebPluginScrollbarImpl final : public WebPluginScrollbar {
41 public: 41 public:
42 WebPluginScrollbarImpl(Orientation, ScrollbarGroup*, WebPluginScrollbarClien t*); 42 WebPluginScrollbarImpl(Orientation, ScrollbarGroup*, WebPluginScrollbarClien t*);
43 virtual ~WebPluginScrollbarImpl(); 43 virtual ~WebPluginScrollbarImpl();
44 44
45 void setScrollOffset(int); 45 void setScrollOffset(int);
46 void invalidateScrollbarRect(const IntRect&); 46 void invalidateScrollbarRect(const IntRect&);
47 // FIXME: Combine this with the other getTickmarks method 47 // FIXME: Combine this with the other getTickmarks method
48 void getTickmarks(Vector<IntRect>&) const; 48 void getTickmarks(Vector<IntRect>&) const;
49 IntPoint convertFromContainingViewToScrollbar(const IntPoint& parentPoint) c onst; 49 IntPoint convertFromContainingViewToScrollbar(const IntPoint& parentPoint) c onst;
50 void scrollbarStyleChanged(); 50 void scrollbarStyleChanged();
51 51
52 int scrollOffset() { return m_scrollOffset; } 52 int scrollOffset() { return m_scrollOffset; }
53 Scrollbar* scrollbar() { return m_scrollbar.get(); } 53 Scrollbar* scrollbar() { return m_scrollbar.get(); }
54 54
55 // WebScrollbar methods 55 // WebScrollbar methods
56 virtual bool isOverlay() const OVERRIDE; 56 virtual bool isOverlay() const override;
57 virtual int value() const OVERRIDE; 57 virtual int value() const override;
58 virtual WebPoint location() const OVERRIDE; 58 virtual WebPoint location() const override;
59 virtual WebSize size() const OVERRIDE; 59 virtual WebSize size() const override;
60 virtual bool enabled() const OVERRIDE; 60 virtual bool enabled() const override;
61 virtual int maximum() const OVERRIDE; 61 virtual int maximum() const override;
62 virtual int totalSize() const OVERRIDE; 62 virtual int totalSize() const override;
63 virtual bool isScrollViewScrollbar() const OVERRIDE; 63 virtual bool isScrollViewScrollbar() const override;
64 virtual bool isScrollableAreaActive() const OVERRIDE; 64 virtual bool isScrollableAreaActive() const override;
65 virtual void getTickmarks(WebVector<WebRect>& tickmarks) const OVERRIDE; 65 virtual void getTickmarks(WebVector<WebRect>& tickmarks) const override;
66 virtual WebScrollbar::ScrollbarControlSize controlSize() const OVERRIDE; 66 virtual WebScrollbar::ScrollbarControlSize controlSize() const override;
67 virtual WebScrollbar::ScrollbarPart pressedPart() const OVERRIDE; 67 virtual WebScrollbar::ScrollbarPart pressedPart() const override;
68 virtual WebScrollbar::ScrollbarPart hoveredPart() const OVERRIDE; 68 virtual WebScrollbar::ScrollbarPart hoveredPart() const override;
69 virtual WebScrollbar::ScrollbarOverlayStyle scrollbarOverlayStyle() const OV ERRIDE; 69 virtual WebScrollbar::ScrollbarOverlayStyle scrollbarOverlayStyle() const ov erride;
70 virtual WebScrollbar::Orientation orientation() const OVERRIDE; 70 virtual WebScrollbar::Orientation orientation() const override;
71 virtual bool isLeftSideVerticalScrollbar() const OVERRIDE; 71 virtual bool isLeftSideVerticalScrollbar() const override;
72 virtual bool isCustomScrollbar() const OVERRIDE; 72 virtual bool isCustomScrollbar() const override;
73 73
74 // WebPluginScrollbar methods 74 // WebPluginScrollbar methods
75 virtual void setLocation(const WebRect&) OVERRIDE; 75 virtual void setLocation(const WebRect&) override;
76 virtual void setValue(int position) OVERRIDE; 76 virtual void setValue(int position) override;
77 virtual void setDocumentSize(int) OVERRIDE; 77 virtual void setDocumentSize(int) override;
78 virtual void scroll(ScrollDirection, ScrollGranularity, float multiplier) OV ERRIDE; 78 virtual void scroll(ScrollDirection, ScrollGranularity, float multiplier) ov erride;
79 virtual void paint(WebCanvas*, const WebRect&) OVERRIDE; 79 virtual void paint(WebCanvas*, const WebRect&) override;
80 virtual bool handleInputEvent(const WebInputEvent&) OVERRIDE; 80 virtual bool handleInputEvent(const WebInputEvent&) override;
81 virtual bool isAlphaLocked() const OVERRIDE; 81 virtual bool isAlphaLocked() const override;
82 virtual void setIsAlphaLocked(bool) OVERRIDE; 82 virtual void setIsAlphaLocked(bool) override;
83 83
84 private: 84 private:
85 bool onMouseDown(const WebInputEvent&); 85 bool onMouseDown(const WebInputEvent&);
86 bool onMouseUp(const WebInputEvent&); 86 bool onMouseUp(const WebInputEvent&);
87 bool onMouseMove(const WebInputEvent&); 87 bool onMouseMove(const WebInputEvent&);
88 bool onMouseLeave(const WebInputEvent&); 88 bool onMouseLeave(const WebInputEvent&);
89 bool onMouseWheel(const WebInputEvent&); 89 bool onMouseWheel(const WebInputEvent&);
90 bool onKeyDown(const WebInputEvent&); 90 bool onKeyDown(const WebInputEvent&);
91 91
92 ScrollbarGroup* m_group; 92 ScrollbarGroup* m_group;
93 WebPluginScrollbarClient* m_client; 93 WebPluginScrollbarClient* m_client;
94 94
95 int m_scrollOffset; 95 int m_scrollOffset;
96 RefPtr<Scrollbar> m_scrollbar; 96 RefPtr<Scrollbar> m_scrollbar;
97 }; 97 };
98 98
99 } // namespace blink 99 } // namespace blink
100 100
101 #endif 101 #endif
OLDNEW
« no previous file with comments | « Source/web/WebPluginContainerImpl.h ('k') | Source/web/WebPopupMenuImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698