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

Side by Side Diff: webkit/plugins/ppapi/plugin_module.cc

Issue 8506016: Remove 'Flash' from TCP/UDP Pepper interfaces. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolved last comments Created 9 years, 1 month 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/thunk/thunk.h ('k') | webkit/plugins/ppapi/resource_creation_impl.h » ('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) 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"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "ppapi/c/ppb_url_request_info.h" 61 #include "ppapi/c/ppb_url_request_info.h"
62 #include "ppapi/c/ppb_url_response_info.h" 62 #include "ppapi/c/ppb_url_response_info.h"
63 #include "ppapi/c/ppb_var.h" 63 #include "ppapi/c/ppb_var.h"
64 #include "ppapi/c/ppp.h" 64 #include "ppapi/c/ppp.h"
65 #include "ppapi/c/ppp_instance.h" 65 #include "ppapi/c/ppp_instance.h"
66 #include "ppapi/c/private/ppb_flash.h" 66 #include "ppapi/c/private/ppb_flash.h"
67 #include "ppapi/c/private/ppb_flash_clipboard.h" 67 #include "ppapi/c/private/ppb_flash_clipboard.h"
68 #include "ppapi/c/private/ppb_flash_file.h" 68 #include "ppapi/c/private/ppb_flash_file.h"
69 #include "ppapi/c/private/ppb_flash_fullscreen.h" 69 #include "ppapi/c/private/ppb_flash_fullscreen.h"
70 #include "ppapi/c/private/ppb_flash_tcp_socket.h" 70 #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_gpu_blacklist_private.h" 71 #include "ppapi/c/private/ppb_gpu_blacklist_private.h"
73 #include "ppapi/c/private/ppb_instance_private.h" 72 #include "ppapi/c/private/ppb_instance_private.h"
74 #include "ppapi/c/private/ppb_pdf.h" 73 #include "ppapi/c/private/ppb_pdf.h"
75 #include "ppapi/c/private/ppb_proxy_private.h" 74 #include "ppapi/c/private/ppb_proxy_private.h"
75 #include "ppapi/c/private/ppb_tcp_socket_private.h"
76 #include "ppapi/c/private/ppb_udp_socket_private.h"
76 #include "ppapi/c/private/ppb_uma_private.h" 77 #include "ppapi/c/private/ppb_uma_private.h"
77 #include "ppapi/c/trusted/ppb_audio_trusted.h" 78 #include "ppapi/c/trusted/ppb_audio_trusted.h"
78 #include "ppapi/c/trusted/ppb_broker_trusted.h" 79 #include "ppapi/c/trusted/ppb_broker_trusted.h"
79 #include "ppapi/c/trusted/ppb_buffer_trusted.h" 80 #include "ppapi/c/trusted/ppb_buffer_trusted.h"
80 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h" 81 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h"
81 #include "ppapi/c/trusted/ppb_file_io_trusted.h" 82 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
82 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" 83 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"
83 #include "ppapi/c/trusted/ppb_image_data_trusted.h" 84 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
84 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" 85 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
85 #include "ppapi/shared_impl/input_event_impl.h" 86 #include "ppapi/shared_impl/input_event_impl.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk(); 277 return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk();
277 if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY) == 0) 278 if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY) == 0)
278 return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk(); 279 return ::ppapi::thunk::GetPPB_Flash_Clipboard_Thunk();
279 if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0) 280 if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0)
280 return PPB_Flash_File_FileRef_Impl::GetInterface(); 281 return PPB_Flash_File_FileRef_Impl::GetInterface();
281 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0) 282 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0)
282 return PPB_Flash_File_ModuleLocal_Impl::GetInterface(); 283 return PPB_Flash_File_ModuleLocal_Impl::GetInterface();
283 if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0) 284 if (strcmp(name, PPB_FLASH_MENU_INTERFACE) == 0)
284 return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk(); 285 return ::ppapi::thunk::GetPPB_Flash_Menu_Thunk();
285 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0) 286 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE) == 0)
286 return ::ppapi::thunk::GetPPB_Flash_TCPSocket_Thunk(); 287 return ::ppapi::thunk::GetPPB_TCPSocket_Private_Thunk();
287 if (strcmp(name, PPB_FLASH_UDPSOCKET_INTERFACE) == 0)
288 return ::ppapi::thunk::GetPPB_Flash_UDPSocket_Thunk();
289 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_4) == 0) 288 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE_0_4) == 0)
290 return ::ppapi::thunk::GetPPB_FlashFullscreen_Thunk(); 289 return ::ppapi::thunk::GetPPB_FlashFullscreen_Thunk();
291 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0) 290 if (strcmp(name, PPB_FULLSCREEN_DEV_INTERFACE) == 0)
292 return ::ppapi::thunk::GetPPB_Fullscreen_Thunk(); 291 return ::ppapi::thunk::GetPPB_Fullscreen_Thunk();
293 if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0) 292 if (strcmp(name, PPB_GPU_BLACKLIST_INTERFACE) == 0)
294 return PPB_GpuBlacklist_Private_Impl::GetInterface(); 293 return PPB_GpuBlacklist_Private_Impl::GetInterface();
295 if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0) 294 if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0)
296 return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk(); 295 return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk();
297 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) 296 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0)
298 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk(); 297 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk();
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after
558 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 557 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
559 if (retval != 0) { 558 if (retval != 0) {
560 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 559 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
561 return false; 560 return false;
562 } 561 }
563 return true; 562 return true;
564 } 563 }
565 564
566 } // namespace ppapi 565 } // namespace ppapi
567 } // namespace webkit 566 } // namespace webkit
OLDNEW
« no previous file with comments | « ppapi/thunk/thunk.h ('k') | webkit/plugins/ppapi/resource_creation_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698