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

Side by Side Diff: ppapi/proxy/ppapi_param_traits.h

Issue 10116003: Add #ifdefs to separate NaCl and non-NaCl PPAPI Proxy code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ppapi/proxy/ppapi_messages.h ('k') | ppapi/proxy/ppapi_param_traits.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ 5 #ifndef PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_
6 #define PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ 6 #define PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 template<> 141 template<>
142 struct PPAPI_PROXY_EXPORT ParamTraits< std::vector< 142 struct PPAPI_PROXY_EXPORT ParamTraits< std::vector<
143 ppapi::PPB_FileRef_CreateInfo> > { 143 ppapi::PPB_FileRef_CreateInfo> > {
144 typedef std::vector<ppapi::PPB_FileRef_CreateInfo> param_type; 144 typedef std::vector<ppapi::PPB_FileRef_CreateInfo> param_type;
145 static void Write(Message* m, const param_type& p); 145 static void Write(Message* m, const param_type& p);
146 static bool Read(const Message* m, PickleIterator* iter, param_type* r); 146 static bool Read(const Message* m, PickleIterator* iter, param_type* r);
147 static void Log(const param_type& p, std::string* l); 147 static void Log(const param_type& p, std::string* l);
148 }; 148 };
149 149
150 #if !defined(OS_NACL)
150 template<> 151 template<>
151 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFlashMenu> { 152 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::proxy::SerializedFlashMenu> {
152 typedef ppapi::proxy::SerializedFlashMenu param_type; 153 typedef ppapi::proxy::SerializedFlashMenu param_type;
153 static void Write(Message* m, const param_type& p); 154 static void Write(Message* m, const param_type& p);
154 static bool Read(const Message* m, PickleIterator* iter, param_type* r); 155 static bool Read(const Message* m, PickleIterator* iter, param_type* r);
155 static void Log(const param_type& p, std::string* l); 156 static void Log(const param_type& p, std::string* l);
156 }; 157 };
157 158
158 template<> 159 template<>
159 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_X509Certificate_Fields> { 160 struct PPAPI_PROXY_EXPORT ParamTraits<ppapi::PPB_X509Certificate_Fields> {
160 typedef ppapi::PPB_X509Certificate_Fields param_type; 161 typedef ppapi::PPB_X509Certificate_Fields param_type;
161 static void Write(Message* m, const param_type& p); 162 static void Write(Message* m, const param_type& p);
162 static bool Read(const Message* m, PickleIterator* iter, param_type* r); 163 static bool Read(const Message* m, PickleIterator* iter, param_type* r);
163 static void Log(const param_type& p, std::string* l); 164 static void Log(const param_type& p, std::string* l);
164 }; 165 };
166 #endif // !defined(OS_NACL)
165 167
166 } // namespace IPC 168 } // namespace IPC
167 169
168 #endif // PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_ 170 #endif // PPAPI_PROXY_PPAPI_PARAM_TRAITS_H_
OLDNEW
« no previous file with comments | « ppapi/proxy/ppapi_messages.h ('k') | ppapi/proxy/ppapi_param_traits.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698