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

Side by Side Diff: include/views/SkWidget.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 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 | « include/views/SkOSWindow_Unix.h ('k') | include/xml/SkXMLWriter.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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #ifndef SkWidget_DEFINED 8 #ifndef SkWidget_DEFINED
9 #define SkWidget_DEFINED 9 #define SkWidget_DEFINED
10 10
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 typedef SkHasLabelWidget INHERITED; 94 typedef SkHasLabelWidget INHERITED;
95 }; 95 };
96 96
97 //////////////////////////////////////////////////////////////////////////////// 97 ////////////////////////////////////////////////////////////////////////////////
98 98
99 class SkPushButtonWidget : public SkButtonWidget { 99 class SkPushButtonWidget : public SkButtonWidget {
100 public: 100 public:
101 SkPushButtonWidget(uint32_t flags = 0) : SkButtonWidget(flags) {} 101 SkPushButtonWidget(uint32_t flags = 0) : SkButtonWidget(flags) {}
102 102
103 protected: 103 protected:
104 bool onEvent(const SkEvent&) SK_OVERRIDE; 104 bool onEvent(const SkEvent&) override;
105 void onDraw(SkCanvas*) SK_OVERRIDE; 105 void onDraw(SkCanvas*) override;
106 Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE ; 106 Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override;
107 bool onClick(Click* click) SK_OVERRIDE; 107 bool onClick(Click* click) override;
108 108
109 private: 109 private:
110 typedef SkButtonWidget INHERITED; 110 typedef SkButtonWidget INHERITED;
111 }; 111 };
112 112
113 //////////////////////////////////////////////////////////////////////////////// 113 ////////////////////////////////////////////////////////////////////////////////
114 114
115 class SkCheckBoxWidget : public SkButtonWidget { 115 class SkCheckBoxWidget : public SkButtonWidget {
116 public: 116 public:
117 SkCheckBoxWidget(uint32_t flags = 0); 117 SkCheckBoxWidget(uint32_t flags = 0);
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 403
404 int logicalToVisualIndex(int index) const { return index; } 404 int logicalToVisualIndex(int index) const { return index; }
405 void invalSelection(); 405 void invalSelection();
406 bool getCellRect(int index, SkRect*) const; 406 bool getCellRect(int index, SkRect*) const;
407 void ensureSelectionIsVisible(); 407 void ensureSelectionIsVisible();
408 408
409 typedef SkView INHERITED; 409 typedef SkView INHERITED;
410 }; 410 };
411 411
412 #endif 412 #endif
OLDNEW
« no previous file with comments | « include/views/SkOSWindow_Unix.h ('k') | include/xml/SkXMLWriter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698