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

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

Issue 10163012: Move the FlashClipboard API into the Flash one. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments & fixes. Created 8 years, 8 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 | « webkit/plugins/ppapi/host_globals.cc ('k') | webkit/plugins/ppapi/ppb_flash_clipboard_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) 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 "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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 #include "ppapi/shared_impl/ppb_var_shared.h" 102 #include "ppapi/shared_impl/ppb_var_shared.h"
103 #include "ppapi/shared_impl/time_conversion.h" 103 #include "ppapi/shared_impl/time_conversion.h"
104 #include "ppapi/thunk/enter.h" 104 #include "ppapi/thunk/enter.h"
105 #include "ppapi/thunk/thunk.h" 105 #include "ppapi/thunk/thunk.h"
106 #include "webkit/plugins/plugin_switches.h" 106 #include "webkit/plugins/plugin_switches.h"
107 #include "webkit/plugins/ppapi/common.h" 107 #include "webkit/plugins/ppapi/common.h"
108 #include "webkit/plugins/ppapi/host_globals.h" 108 #include "webkit/plugins/ppapi/host_globals.h"
109 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 109 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
110 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 110 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
111 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h" 111 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
112 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
113 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h" 112 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
114 #include "webkit/plugins/ppapi/ppb_flash_impl.h" 113 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
115 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h" 114 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
116 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h" 115 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h"
117 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" 116 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
118 #include "webkit/plugins/ppapi/ppb_image_data_impl.h" 117 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
119 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h" 118 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h"
120 #include "webkit/plugins/ppapi/ppb_proxy_impl.h" 119 #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
121 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" 120 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
122 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h" 121 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
304 // Please keep alphabetized by interface macro name with "special" stuff at 303 // Please keep alphabetized by interface macro name with "special" stuff at
305 // the bottom. 304 // the bottom.
306 if (strcmp(name, PPB_AUDIO_INPUT_TRUSTED_DEV_INTERFACE_0_1) == 0) 305 if (strcmp(name, PPB_AUDIO_INPUT_TRUSTED_DEV_INTERFACE_0_1) == 0)
307 return ::ppapi::thunk::GetPPB_AudioInputTrusted_0_1_Thunk(); 306 return ::ppapi::thunk::GetPPB_AudioInputTrusted_0_1_Thunk();
308 if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE_0_6) == 0) 307 if (strcmp(name, PPB_AUDIO_TRUSTED_INTERFACE_0_6) == 0)
309 return ::ppapi::thunk::GetPPB_AudioTrusted_0_6_Thunk(); 308 return ::ppapi::thunk::GetPPB_AudioTrusted_0_6_Thunk();
310 if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE_0_1) == 0) 309 if (strcmp(name, PPB_BUFFER_TRUSTED_INTERFACE_0_1) == 0)
311 return ::ppapi::thunk::GetPPB_BufferTrusted_0_1_Thunk(); 310 return ::ppapi::thunk::GetPPB_BufferTrusted_0_1_Thunk();
312 if (strcmp(name, PPB_CORE_INTERFACE_1_0) == 0) 311 if (strcmp(name, PPB_CORE_INTERFACE_1_0) == 0)
313 return &core_interface; 312 return &core_interface;
314 if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_4_0) == 0)
315 return ::ppapi::thunk::GetPPB_Flash_Clipboard_4_0_Thunk();
316 if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_0) == 0)
317 return ::ppapi::thunk::GetPPB_Flash_Clipboard_3_0_Thunk();
318 if (strcmp(name, PPB_FLASH_CLIPBOARD_INTERFACE_3_LEGACY) == 0)
319 return ::ppapi::thunk::GetPPB_Flash_Clipboard_3_0_Thunk();
320 if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0) 313 if (strcmp(name, PPB_FLASH_FILE_FILEREF_INTERFACE) == 0)
321 return PPB_Flash_File_FileRef_Impl::GetInterface(); 314 return PPB_Flash_File_FileRef_Impl::GetInterface();
322 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0) 315 if (strcmp(name, PPB_FLASH_FILE_MODULELOCAL_INTERFACE) == 0)
323 return PPB_Flash_File_ModuleLocal_Impl::GetInterface(); 316 return PPB_Flash_File_ModuleLocal_Impl::GetInterface();
324 if (strcmp(name, PPB_FLASH_MENU_INTERFACE_0_2) == 0) 317 if (strcmp(name, PPB_FLASH_MENU_INTERFACE_0_2) == 0)
325 return ::ppapi::thunk::GetPPB_Flash_Menu_0_2_Thunk(); 318 return ::ppapi::thunk::GetPPB_Flash_Menu_0_2_Thunk();
326 if (strcmp(name, PPB_FLASH_MESSAGELOOP_INTERFACE_0_1) == 0) 319 if (strcmp(name, PPB_FLASH_MESSAGELOOP_INTERFACE_0_1) == 0)
327 return ::ppapi::thunk::GetPPB_Flash_MessageLoop_0_1_Thunk(); 320 return ::ppapi::thunk::GetPPB_Flash_MessageLoop_0_1_Thunk();
328 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE_0_2) == 0) 321 if (strcmp(name, PPB_FLASH_TCPSOCKET_INTERFACE_0_2) == 0)
329 return ::ppapi::thunk::GetPPB_TCPSocket_Private_0_3_Thunk(); 322 return ::ppapi::thunk::GetPPB_TCPSocket_Private_0_3_Thunk();
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 602 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
610 if (retval != 0) { 603 if (retval != 0) {
611 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 604 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
612 return false; 605 return false;
613 } 606 }
614 return true; 607 return true;
615 } 608 }
616 609
617 } // namespace ppapi 610 } // namespace ppapi
618 } // namespace webkit 611 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/plugins/ppapi/host_globals.cc ('k') | webkit/plugins/ppapi/ppb_flash_clipboard_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698