commit 36352bf5e38f45a70ee4f4fc132a38048d38206d
author mtklein <mtklein@chromium.org> Wed Mar 25 18:17:31 2015 -0700
committer Commit bot <commit-bot@chromium.org> Wed Mar 25 18:17:32 2015 -0700
tree 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6
parent 02fd592c8d190058652bb715fb34feb7a72992e5

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

src/codec/SkCodec_libico.h

diff --git a/src/codec/SkCodec_libico.h b/src/codec/SkCodec_libico.h
index 778bcd2..a690cdd 100644
--- a/src/codec/SkCodec_libico.h
+++ b/src/codec/SkCodec_libico.h
@@ -33,16 +33,16 @@
     /*
      * Chooses the best dimensions given the desired scale
      */
-    SkISize onGetScaledDimensions(float desiredScale) const SK_OVERRIDE;
+    SkISize onGetScaledDimensions(float desiredScale) const override;
 
     /*
      * Initiates the Ico decode
      */
     Result onGetPixels(const SkImageInfo& dstInfo, void* dst,
                        size_t dstRowBytes, const Options&, SkPMColor*, int*)
-                       SK_OVERRIDE;
+                       override;
 
-    SkEncodedFormat onGetEncodedFormat() const SK_OVERRIDE {
+    SkEncodedFormat onGetEncodedFormat() const override {
         return kICO_SkEncodedFormat;
     }