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

Side by Side Diff: include/views/SkWindow.h

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Rebase Created 5 years, 8 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 | « include/views/SkOSWindow_NaCl.h ('k') | platform_tools/nacl/SampleApp/SampleApp.nmf » ('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 2006 The Android Open Source Project 2 * Copyright 2006 The Android Open Source Project
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 SkWindow_DEFINED 8 #ifndef SkWindow_DEFINED
9 #define SkWindow_DEFINED 9 #define SkWindow_DEFINED
10 10
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 bool fWaitingOnInval; 115 bool fWaitingOnInval;
116 116
117 SkString fTitle; 117 SkString fTitle;
118 SkMatrix fMatrix; 118 SkMatrix fMatrix;
119 119
120 typedef SkView INHERITED; 120 typedef SkView INHERITED;
121 }; 121 };
122 122
123 //////////////////////////////////////////////////////////////////////////////// 123 ////////////////////////////////////////////////////////////////////////////////
124 124
125 #if defined(SK_BUILD_FOR_NACL) 125 #if defined(SK_BUILD_FOR_MAC)
126 #include "SkOSWindow_NaCl.h"
127 #elif defined(SK_BUILD_FOR_MAC)
128 #include "SkOSWindow_Mac.h" 126 #include "SkOSWindow_Mac.h"
129 #elif defined(SK_BUILD_FOR_WIN) 127 #elif defined(SK_BUILD_FOR_WIN)
130 #include "SkOSWindow_Win.h" 128 #include "SkOSWindow_Win.h"
131 #elif defined(SK_BUILD_FOR_ANDROID) 129 #elif defined(SK_BUILD_FOR_ANDROID)
132 #include "SkOSWindow_Android.h" 130 #include "SkOSWindow_Android.h"
133 #elif defined(SK_BUILD_FOR_UNIX) 131 #elif defined(SK_BUILD_FOR_UNIX)
134 #include "SkOSWindow_Unix.h" 132 #include "SkOSWindow_Unix.h"
135 #elif defined(SK_BUILD_FOR_SDL) 133 #elif defined(SK_BUILD_FOR_SDL)
136 #include "SkOSWindow_SDL.h" 134 #include "SkOSWindow_SDL.h"
137 #elif defined(SK_BUILD_FOR_IOS) 135 #elif defined(SK_BUILD_FOR_IOS)
138 #include "SkOSWindow_iOS.h" 136 #include "SkOSWindow_iOS.h"
139 #endif 137 #endif
140 138
141 #endif 139 #endif
OLDNEW
« no previous file with comments | « include/views/SkOSWindow_NaCl.h ('k') | platform_tools/nacl/SampleApp/SampleApp.nmf » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698