diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-25 18:17:31 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-25 18:17:32 -0700 |
| commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
| tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /include/views | |
| parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) | |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'include/views')
| -rw-r--r-- | include/views/SkOSWindow_Unix.h | 2 | ||||
| -rw-r--r-- | include/views/SkWidget.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/views/SkOSWindow_Unix.h b/include/views/SkOSWindow_Unix.h index 8c4d81962a..2811ff855c 100644 --- a/include/views/SkOSWindow_Unix.h +++ b/include/views/SkOSWindow_Unix.h @@ -48,7 +48,7 @@ public: protected: // Overridden from from SkWindow: - void onSetTitle(const char title[]) SK_OVERRIDE; + void onSetTitle(const char title[]) override; private: enum NextXEventResult { diff --git a/include/views/SkWidget.h b/include/views/SkWidget.h index 28f0e9a047..3c9363440b 100644 --- a/include/views/SkWidget.h +++ b/include/views/SkWidget.h @@ -101,10 +101,10 @@ public: SkPushButtonWidget(uint32_t flags = 0) : SkButtonWidget(flags) {} protected: - bool onEvent(const SkEvent&) SK_OVERRIDE; - void onDraw(SkCanvas*) SK_OVERRIDE; - Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) SK_OVERRIDE; - bool onClick(Click* click) SK_OVERRIDE; + bool onEvent(const SkEvent&) override; + void onDraw(SkCanvas*) override; + Click* onFindClickHandler(SkScalar x, SkScalar y, unsigned modi) override; + bool onClick(Click* click) override; private: typedef SkButtonWidget INHERITED; |