diff options
author | 2012-09-29 12:40:30 +0000 | |
---|---|---|
committer | 2012-09-29 12:40:30 +0000 | |
commit | f726a1c9e6efad526eba603be9f24b4b77b993eb (patch) | |
tree | fd31e980b5c8bb3b24fa8e5b67c0528b04a14e7a /samplecode/SampleApp.h | |
parent | 22b460cef604c4737b9e221901e1940681255c01 (diff) |
samplecode: Remove duplicated include of SkWindow.h from SampleApp.h
R=epoger@google.com
Review URL: https://codereview.appspot.com/6566051
git-svn-id: http://skia.googlecode.com/svn/trunk@5737 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'samplecode/SampleApp.h')
-rw-r--r-- | samplecode/SampleApp.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/samplecode/SampleApp.h b/samplecode/SampleApp.h index 202fe21ad3..abd8ac7c67 100644 --- a/samplecode/SampleApp.h +++ b/samplecode/SampleApp.h @@ -1,4 +1,3 @@ - /* * Copyright 2011 Skia * @@ -6,28 +5,25 @@ * found in the LICENSE file. */ +#ifndef SampleApp_DEFINED +#define SampleApp_DEFINED -#ifndef SampleWindow_DEFINED -#define SampleWindow_DEFINED - -#include "SkWindow.h" - -#include "SampleCode.h" +#include "SkOSMenu.h" #include "SkPath.h" #include "SkScalar.h" #include "SkTDArray.h" #include "SkTouchGesture.h" #include "SkWindow.h" -#include "SkOSMenu.h" class GrContext; class GrRenderTarget; -class SkEvent; class SkCanvas; +class SkData; +class SkEvent; class SkPicture; class SkTypeface; -class SkData; +class SkViewFactory; class SampleWindow : public SkOSWindow { SkTDArray<const SkViewFactory*> fSamples; |