From 36352bf5e38f45a70ee4f4fc132a38048d38206d Mon Sep 17 00:00:00 2001 From: mtklein Date: Wed, 25 Mar 2015 18:17:31 -0700 Subject: 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 --- include/views/SkOSWindow_Unix.h | 2 +- include/views/SkWidget.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include/views') 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; -- cgit v1.2.3