OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "webkit/plugins/ppapi/plugin_module.h" | 5 #include "webkit/plugins/ppapi/plugin_module.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/message_loop.h" | 13 #include "base/message_loop.h" |
14 #include "base/message_loop_proxy.h" | 14 #include "base/message_loop_proxy.h" |
15 #include "base/time.h" | 15 #include "base/time.h" |
| 16 #include "ppapi/c/dev/ppb_audio_input_dev.h" |
16 #include "ppapi/c/dev/ppb_buffer_dev.h" | 17 #include "ppapi/c/dev/ppb_buffer_dev.h" |
17 #include "ppapi/c/dev/ppb_char_set_dev.h" | 18 #include "ppapi/c/dev/ppb_char_set_dev.h" |
18 #include "ppapi/c/dev/ppb_console_dev.h" | 19 #include "ppapi/c/dev/ppb_console_dev.h" |
19 #include "ppapi/c/dev/ppb_context_3d_dev.h" | 20 #include "ppapi/c/dev/ppb_context_3d_dev.h" |
20 #include "ppapi/c/dev/ppb_context_3d_trusted_dev.h" | 21 #include "ppapi/c/dev/ppb_context_3d_trusted_dev.h" |
21 #include "ppapi/c/dev/ppb_crypto_dev.h" | 22 #include "ppapi/c/dev/ppb_crypto_dev.h" |
22 #include "ppapi/c/dev/ppb_cursor_control_dev.h" | 23 #include "ppapi/c/dev/ppb_cursor_control_dev.h" |
23 #include "ppapi/c/dev/ppb_directory_reader_dev.h" | 24 #include "ppapi/c/dev/ppb_directory_reader_dev.h" |
24 #include "ppapi/c/dev/ppb_file_chooser_dev.h" | 25 #include "ppapi/c/dev/ppb_file_chooser_dev.h" |
25 #include "ppapi/c/dev/ppb_find_dev.h" | 26 #include "ppapi/c/dev/ppb_find_dev.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 #include "ppapi/c/private/ppb_flash_clipboard.h" | 68 #include "ppapi/c/private/ppb_flash_clipboard.h" |
68 #include "ppapi/c/private/ppb_flash_file.h" | 69 #include "ppapi/c/private/ppb_flash_file.h" |
69 #include "ppapi/c/private/ppb_flash_fullscreen.h" | 70 #include "ppapi/c/private/ppb_flash_fullscreen.h" |
70 #include "ppapi/c/private/ppb_flash_tcp_socket.h" | 71 #include "ppapi/c/private/ppb_flash_tcp_socket.h" |
71 #include "ppapi/c/private/ppb_flash_udp_socket.h" | 72 #include "ppapi/c/private/ppb_flash_udp_socket.h" |
72 #include "ppapi/c/private/ppb_gpu_blacklist_private.h" | 73 #include "ppapi/c/private/ppb_gpu_blacklist_private.h" |
73 #include "ppapi/c/private/ppb_instance_private.h" | 74 #include "ppapi/c/private/ppb_instance_private.h" |
74 #include "ppapi/c/private/ppb_pdf.h" | 75 #include "ppapi/c/private/ppb_pdf.h" |
75 #include "ppapi/c/private/ppb_proxy_private.h" | 76 #include "ppapi/c/private/ppb_proxy_private.h" |
76 #include "ppapi/c/private/ppb_uma_private.h" | 77 #include "ppapi/c/private/ppb_uma_private.h" |
| 78 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h" |
77 #include "ppapi/c/trusted/ppb_audio_trusted.h" | 79 #include "ppapi/c/trusted/ppb_audio_trusted.h" |
78 #include "ppapi/c/trusted/ppb_broker_trusted.h" | 80 #include "ppapi/c/trusted/ppb_broker_trusted.h" |
79 #include "ppapi/c/trusted/ppb_buffer_trusted.h" | 81 #include "ppapi/c/trusted/ppb_buffer_trusted.h" |
80 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h" | 82 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h" |
81 #include "ppapi/c/trusted/ppb_file_io_trusted.h" | 83 #include "ppapi/c/trusted/ppb_file_io_trusted.h" |
82 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" | 84 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" |
83 #include "ppapi/c/trusted/ppb_image_data_trusted.h" | 85 #include "ppapi/c/trusted/ppb_image_data_trusted.h" |
84 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" | 86 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" |
85 #include "ppapi/shared_impl/input_event_impl.h" | 87 #include "ppapi/shared_impl/input_event_impl.h" |
86 #include "ppapi/shared_impl/time_conversion.h" | 88 #include "ppapi/shared_impl/time_conversion.h" |
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 | 253 |
252 #include "ppapi/thunk/interfaces_ppb_public_stable.h" | 254 #include "ppapi/thunk/interfaces_ppb_public_stable.h" |
253 #include "ppapi/thunk/interfaces_ppb_public_dev.h" | 255 #include "ppapi/thunk/interfaces_ppb_public_dev.h" |
254 #include "ppapi/thunk/interfaces_ppb_private.h" | 256 #include "ppapi/thunk/interfaces_ppb_private.h" |
255 | 257 |
256 #undef UNPROXIED_API | 258 #undef UNPROXIED_API |
257 #undef PROXIED_IFACE | 259 #undef PROXIED_IFACE |
258 | 260 |
259 // Please keep alphabetized by interface macro name with "special" stuff at | 261 // Please keep alphabetized by interface macro name with "special" stuff at |
260 // the bottom. | 262 // the bottom. |
| 263 if (strcmp(name, PPB_AUDIO_INPUT_TRUSTED_DEV_INTERFACE) == 0) |
| 264 return ::ppapi::thunk::GetPPB_AudioInputTrusted_Thunk(); |
261 if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE) == 0) | 265 if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE) == 0) |
262 return ::ppapi::thunk::GetPPB_AudioTrusted_Thunk(); | 266 return ::ppapi::thunk::GetPPB_AudioTrusted_Thunk(); |
263 if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE) == 0) | 267 if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE) == 0) |
264 return ::ppapi::thunk::GetPPB_BufferTrusted_Thunk(); | 268 return ::ppapi::thunk::GetPPB_BufferTrusted_Thunk(); |
265 if (strcmp(name, PPB_CONTEXT_3D_TRUSTED_DEV_INTERFACE) == 0) | 269 if (strcmp(name, PPB_CONTEXT_3D_TRUSTED_DEV_INTERFACE) == 0) |
266 return ::ppapi::thunk::GetPPB_Context3DTrusted_Thunk(); | 270 return ::ppapi::thunk::GetPPB_Context3DTrusted_Thunk(); |
267 if (strcmp(name, PPB_CORE_INTERFACE) == 0) | 271 if (strcmp(name, PPB_CORE_INTERFACE) == 0) |
268 return &core_interface; | 272 return &core_interface; |
269 if (strcmp(name, PPB_FILEIOTRUSTED_INTERFACE) == 0) | 273 if (strcmp(name, PPB_FILEIOTRUSTED_INTERFACE) == 0) |
270 return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk(); | 274 return ::ppapi::thunk::GetPPB_FileIOTrusted_Thunk(); |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
558 int retval = entry_points.initialize_module(pp_module(), &GetInterface); | 562 int retval = entry_points.initialize_module(pp_module(), &GetInterface); |
559 if (retval != 0) { | 563 if (retval != 0) { |
560 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; | 564 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; |
561 return false; | 565 return false; |
562 } | 566 } |
563 return true; | 567 return true; |
564 } | 568 } |
565 | 569 |
566 } // namespace ppapi | 570 } // namespace ppapi |
567 } // namespace webkit | 571 } // namespace webkit |
OLD | NEW |