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

3 files changed, 6 insertions, 6 deletions

diff --git a/site/dev/contrib/flatten.md b/site/dev/contrib/flatten.md
index c06a14b812..192571e1c7 100644
--- a/site/dev/contrib/flatten.md
+++ b/site/dev/contrib/flatten.md
@@ -11,7 +11,7 @@ do a few things so that it will work on all platforms:
 
 <!--?prettify?-->
 ~~~~
-virtual void flatten(SkFlattenableWriteBuffer& buffer) const SK_OVERRIDE {
+virtual void flatten(SkFlattenableWriteBuffer& buffer) const override {
     this->INHERITED::flatten(buffer);
     // Write any private data that needs to be stored to recreate this object
 }
diff --git a/site/dev/contrib/style.md b/site/dev/contrib/style.md
index ac31f4ad56..e952ed1b68 100644
--- a/site/dev/contrib/style.md
+++ b/site/dev/contrib/style.md
@@ -321,12 +321,12 @@ private:
 };
 ~~~~
 
-Virtual functions that are overridden in derived classes should use SK_OVERRIDE
+Virtual functions that are overridden in derived classes should use override
 (and not the override keyword). The virtual keyword can be omitted.
 
 <!--?prettify?-->
 ~~~~
-void myVirtual() SK_OVERRIDE {
+void myVirtual() override {
 }
 ~~~~
 
@@ -335,7 +335,7 @@ base-class implementations of a virtual function should be explicitly qualified:
 
 <!--?prettify?-->
 ~~~~
-void myVirtual() SK_OVERRIDE {
+void myVirtual() override {
     ...
     this->INHERITED::myVirtual();
     ...
@@ -343,7 +343,7 @@ void myVirtual() SK_OVERRIDE {
 ~~~~
 
 As in the above example, derived classes that redefine virtual functions should
-use SK_OVERRIDE to note that explicitly.
+use override to note that explicitly.
 
 Constructor initializers should be one per line, indented, with punctuation
 placed before the initializer. This is a fairly new rule so much of the existing
diff --git a/site/user/sample/hello.md b/site/user/sample/hello.md
index d917cf778c..f4c83e0dde 100644
--- a/site/user/sample/hello.md
+++ b/site/user/sample/hello.md
@@ -73,7 +73,7 @@ class HelloTutorial : public SkExample {
         }
 
     protected:
-        void draw(SkCanvas* canvas) SK_OVERRIDE {
+        void draw(SkCanvas* canvas) override {
             // Clear background
             canvas->drawColor(SK_ColorWHITE);