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 AddProxy(API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, | 257 AddProxy(API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, |
258 &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>); | 258 &ProxyFactory<PPP_ContentDecryptor_Private_Proxy>); |
259 AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE, | 259 AddPPP(PPP_CONTENTDECRYPTOR_PRIVATE_INTERFACE, |
260 API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, | 260 API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE, |
261 PPP_ContentDecryptor_Private_Proxy::GetProxyInterface()); | 261 PPP_ContentDecryptor_Private_Proxy::GetProxyInterface()); |
262 #endif | 262 #endif |
263 AddPPB(PPB_Testing_Proxy::GetInfo(), PERMISSION_TESTING); | 263 AddPPB(PPB_Testing_Proxy::GetInfo(), PERMISSION_TESTING); |
264 | 264 |
265 // PPP (plugin) interfaces. | 265 // PPP (plugin) interfaces. |
266 // TODO(brettw) move these to interface_list*.h | 266 // TODO(brettw) move these to interface_list*.h |
267 #if !defined(OS_NACL) | |
267 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>); | 268 AddProxy(API_ID_PPP_INSTANCE, &ProxyFactory<PPP_Instance_Proxy>); |
brettw
2012/10/11 18:05:50
I would have thought this one and the next line wa
bbudge
2012/10/11 18:46:02
You are correct.
| |
268 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE, | 269 AddPPP(PPP_INSTANCE_INTERFACE_1_1, API_ID_PPP_INSTANCE, |
269 PPP_Instance_Proxy::GetInstanceInterface()); | 270 PPP_Instance_Proxy::GetInstanceInterface()); |
270 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>); | 271 AddProxy(API_ID_PPP_PRINTING, &ProxyFactory<PPP_Printing_Proxy>); |
271 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING, | 272 AddPPP(PPP_PRINTING_DEV_INTERFACE, API_ID_PPP_PRINTING, |
272 PPP_Printing_Proxy::GetProxyInterface()); | 273 PPP_Printing_Proxy::GetProxyInterface()); |
273 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>); | 274 AddProxy(API_ID_PPP_TEXT_INPUT, &ProxyFactory<PPP_TextInput_Proxy>); |
274 AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT, | 275 AddPPP(PPP_TEXTINPUT_DEV_INTERFACE, API_ID_PPP_TEXT_INPUT, |
275 PPP_TextInput_Proxy::GetProxyInterface()); | 276 PPP_TextInput_Proxy::GetProxyInterface()); |
276 | 277 |
277 // Old-style GetInfo PPP interfaces. | 278 // Old-style GetInfo PPP interfaces. |
278 // 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 |
279 // TODO(brettw) remove these. | 280 // TODO(brettw) remove these. |
280 AddPPP(PPP_InputEvent_Proxy::GetInfo()); | 281 AddPPP(PPP_InputEvent_Proxy::GetInfo()); |
brettw
2012/10/11 18:05:50
Linewise, all of these 4 lines seem necessary.
bbudge
2012/10/11 18:46:02
Done.
| |
281 AddPPP(PPP_Messaging_Proxy::GetInfo()); | 282 AddPPP(PPP_Messaging_Proxy::GetInfo()); |
282 AddPPP(PPP_MouseLock_Proxy::GetInfo()); | 283 AddPPP(PPP_MouseLock_Proxy::GetInfo()); |
283 AddPPP(PPP_Graphics3D_Proxy::GetInfo()); | 284 AddPPP(PPP_Graphics3D_Proxy::GetInfo()); |
284 #if !defined(OS_NACL) | |
285 AddPPP(PPP_Instance_Private_Proxy::GetInfo()); | 285 AddPPP(PPP_Instance_Private_Proxy::GetInfo()); |
286 AddPPP(PPP_VideoCapture_Proxy::GetInfo()); | 286 AddPPP(PPP_VideoCapture_Proxy::GetInfo()); |
287 AddPPP(PPP_VideoDecoder_Proxy::GetInfo()); | 287 AddPPP(PPP_VideoDecoder_Proxy::GetInfo()); |
288 #endif | 288 #endif |
289 } | 289 } |
290 | 290 |
291 InterfaceList::~InterfaceList() { | 291 InterfaceList::~InterfaceList() { |
292 } | 292 } |
293 | 293 |
294 // static | 294 // static |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
382 AddPPB(info->name, info->id, info->interface_ptr, perm); | 382 AddPPB(info->name, info->id, info->interface_ptr, perm); |
383 } | 383 } |
384 | 384 |
385 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { | 385 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) { |
386 AddProxy(info->id, info->create_proxy); | 386 AddProxy(info->id, info->create_proxy); |
387 AddPPP(info->name, info->id, info->interface_ptr); | 387 AddPPP(info->name, info->id, info->interface_ptr); |
388 } | 388 } |
389 | 389 |
390 } // namespace proxy | 390 } // namespace proxy |
391 } // namespace ppapi | 391 } // namespace ppapi |
OLD | NEW |