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

Side by Side Diff: samplecode/GMSampleView.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 | « samplecode/ClockFaceView.cpp ('k') | samplecode/OverView.cpp » ('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 2011 Google Inc. 2 * Copyright 2011 Google Inc.
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 GMSampleView_DEFINED 8 #ifndef GMSampleView_DEFINED
9 #define GMSampleView_DEFINED 9 #define GMSampleView_DEFINED
10 10
11 #include "SampleCode.h" 11 #include "SampleCode.h"
12 #include "gm.h" 12 #include "gm.h"
13 13
14 class GMSampleView : public SampleView { 14 class GMSampleView : public SampleView {
15 private: 15 private:
16 bool fShowSize; 16 bool fShowSize;
17 typedef skiagm::GM GM; 17 typedef skiagm::GM GM;
18 18
19 public: 19 public:
20 GMSampleView(GM*); 20 GMSampleView(GM*);
21 virtual ~GMSampleView(); 21 virtual ~GMSampleView();
22 22
23 static SkEvent* NewShowSizeEvt(bool doShowSize); 23 static SkEvent* NewShowSizeEvt(bool doShowSize);
24 24
25 protected: 25 protected:
26 bool onQuery(SkEvent*) SK_OVERRIDE; 26 bool onQuery(SkEvent*) override;
27 bool onEvent(const SkEvent&) SK_OVERRIDE; 27 bool onEvent(const SkEvent&) override;
28 void onDrawContent(SkCanvas*) SK_OVERRIDE; 28 void onDrawContent(SkCanvas*) override;
29 void onDrawBackground(SkCanvas*) SK_OVERRIDE; 29 void onDrawBackground(SkCanvas*) override;
30 bool onAnimate(const SkAnimTimer&) SK_OVERRIDE; 30 bool onAnimate(const SkAnimTimer&) override;
31 31
32 private: 32 private:
33 GM* fGM; 33 GM* fGM;
34 typedef SampleView INHERITED; 34 typedef SampleView INHERITED;
35 }; 35 };
36 36
37 #endif 37 #endif
OLDNEW
« no previous file with comments | « samplecode/ClockFaceView.cpp ('k') | samplecode/OverView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698