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

Side by Side Diff: ppapi/proxy/interface_list.cc

Issue 10918083: Changes to allow testing interface for new NaCl Proxy (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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/ppapi_proxy.gypi ('k') | ppapi/proxy/ppb_audio_proxy.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 #include "ppapi/proxy/interface_list.h" 5 #include "ppapi/proxy/interface_list.h"
6 6
7 #include "base/memory/singleton.h" 7 #include "base/memory/singleton.h"
8 #include "ppapi/c/dev/ppb_audio_input_dev.h" 8 #include "ppapi/c/dev/ppb_audio_input_dev.h"
9 #include "ppapi/c/dev/ppb_buffer_dev.h" 9 #include "ppapi/c/dev/ppb_buffer_dev.h"
10 #include "ppapi/c/dev/ppb_char_set_dev.h" 10 #include "ppapi/c/dev/ppb_char_set_dev.h"
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 PPB_Var_Shared::GetVarInterface1_1()); 222 PPB_Var_Shared::GetVarInterface1_1());
223 AddPPB(PPB_VAR_INTERFACE_1_0, API_ID_NONE, 223 AddPPB(PPB_VAR_INTERFACE_1_0, API_ID_NONE,
224 PPB_Var_Shared::GetVarInterface1_0()); 224 PPB_Var_Shared::GetVarInterface1_0());
225 225
226 #if !defined(OS_NACL) 226 #if !defined(OS_NACL)
227 // PPB (browser) interfaces. 227 // PPB (browser) interfaces.
228 // Do not add more stuff here, they should be added to interface_list*.h 228 // Do not add more stuff here, they should be added to interface_list*.h
229 // TODO(brettw) remove these. 229 // TODO(brettw) remove these.
230 AddPPB(PPB_Instance_Proxy::GetInfoPrivate()); 230 AddPPB(PPB_Instance_Proxy::GetInfoPrivate());
231 AddPPB(PPB_PDF_Proxy::GetInfo()); 231 AddPPB(PPB_PDF_Proxy::GetInfo());
232 AddPPB(PPB_Testing_Proxy::GetInfo());
233 AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo()); 232 AddPPB(PPB_URLLoader_Proxy::GetTrustedInfo());
234 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo()); 233 AddPPB(PPB_Var_Deprecated_Proxy::GetInfo());
235 234
236 // TODO(tomfinegan): Figure out where to put these once we refactor things 235 // TODO(tomfinegan): Figure out where to put these once we refactor things
237 // to load the PPP interface struct from the PPB interface. 236 // to load the PPP interface struct from the PPB interface.
238 AddProxy(API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, 237 AddProxy(API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
239 &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>); 238 &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>);
240 AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE, 239 AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE,
241 API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, 240 API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
242 PPP_ContentDecryptor_Private_Proxy::GetProxyInterface()); 241 PPP_ContentDecryptor_Private_Proxy::GetProxyInterface());
243 #endif 242 #endif
243 AddPPB(PPB_Testing_Proxy::GetInfo());
244 244
245 // PPP (plugin) interfaces. 245 // PPP (plugin) interfaces.
246 // TODO(brettw) move these to interface_list*.h 246 // TODO(brettw) move these to interface_list*.h
247 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>); 247 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>);
248 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE, 248 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE,
249 PPP_Instance_Proxy::GetInstanceInterface()); 249 PPP_Instance_Proxy::GetInstanceInterface());
250 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>); 250 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>);
251 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING, 251 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING,
252 PPP_Printing_Proxy::GetProxyInterface()); 252 PPP_Printing_Proxy::GetProxyInterface());
253 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>); 253 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>);
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 AddPPB(info->name, info->id, info->interface_ptr); 351 AddPPB(info->name, info->id, info->interface_ptr);
352 } 352 }
353 353
354 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { 354 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
355 AddProxy(info->id, info->create_proxy); 355 AddProxy(info->id, info->create_proxy);
356 AddPPP(info->name, info->id, info->interface_ptr); 356 AddPPP(info->name, info->id, info->interface_ptr);
357 } 357 }
358 358
359 } // namespace proxy 359 } // namespace proxy
360 } // namespace ppapi 360 } // namespace ppapi
OLDNEW
« no previous file with comments | « ppapi/ppapi_proxy.gypi ('k') | ppapi/proxy/ppb_audio_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698