| OLD | NEW |
| 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/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
| 8 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
| 9 #include "ppapi/c/dev/ppb_audio_input_dev.h" | 9 #include "ppapi/c/dev/ppb_audio_input_dev.h" |
| 10 #include "ppapi/c/dev/ppb_buffer_dev.h" | 10 #include "ppapi/c/dev/ppb_buffer_dev.h" |
| (...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>); | 257 &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>); |
| 258 AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE, | 258 AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE, |
| 259 API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, | 259 API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, |
| 260 PPP_ContentDecryptor_Private_Proxy::GetProxyInterface()); | 260 PPP_ContentDecryptor_Private_Proxy::GetProxyInterface()); |
| 261 #endif | 261 #endif |
| 262 AddPPB(PPB_Testing_Proxy::GetInfo(), PERMISSION_TESTING); | 262 AddPPB(PPB_Testing_Proxy::GetInfo(), PERMISSION_TESTING); |
| 263 | 263 |
| 264 // PPP (plugin) interfaces. | 264 // PPP (plugin) interfaces. |
| 265 // TODO(brettw) move these to interface_list*.h | 265 // TODO(brettw) move these to interface_list*.h |
| 266 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>); | 266 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>); |
| 267 #if !defined(OS_NACL) |
| 267 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE, | 268 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE, |
| 268 PPP_Instance_Proxy::GetInstanceInterface()); | 269 PPP_Instance_Proxy::GetInstanceInterface()); |
| 270 #endif |
| 269 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>); | 271 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>); |
| 270 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING, | 272 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING, |
| 271 PPP_Printing_Proxy::GetProxyInterface()); | 273 PPP_Printing_Proxy::GetProxyInterface()); |
| 272 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>); | 274 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>); |
| 273 AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT, | 275 AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT, |
| 274 PPP_TextInput_Proxy::GetProxyInterface()); | 276 PPP_TextInput_Proxy::GetProxyInterface()); |
| 275 | 277 |
| 276 // Old-style GetInfo PPP interfaces. | 278 // Old-style GetInfo PPP interfaces. |
| 277 // Do not add more stuff here, they should be added to interface_list*.h | 279 // Do not add more stuff here, they should be added to interface_list*.h |
| 278 // TODO(brettw) remove these. | 280 // TODO(brettw) remove these. |
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 381 AddPPB(info->name, info->id, info->interface_ptr, perm); | 383 AddPPB(info->name, info->id, info->interface_ptr, perm); |
| 382 } | 384 } |
| 383 | 385 |
| 384 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { | 386 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { |
| 385 AddProxy(info->id, info->create_proxy); | 387 AddProxy(info->id, info->create_proxy); |
| 386 AddPPP(info->name, info->id, info->interface_ptr); | 388 AddPPP(info->name, info->id, info->interface_ptr); |
| 387 } | 389 } |
| 388 | 390 |
| 389 } // namespace proxy | 391 } // namespace proxy |
| 390 } // namespace ppapi | 392 } // namespace ppapi |
| OLD | NEW |