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

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

Issue 8824015: Revert 113290 - Rename the shared_impl resource files to give them more regular names. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 #include "ppapi/c/private/ppb_uma_private.h" 76 #include "ppapi/c/private/ppb_uma_private.h"
77 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h" 77 #include "ppapi/c/trusted/ppb_audio_input_trusted_dev.h"
78 #include "ppapi/c/trusted/ppb_audio_trusted.h" 78 #include "ppapi/c/trusted/ppb_audio_trusted.h"
79 #include "ppapi/c/trusted/ppb_broker_trusted.h" 79 #include "ppapi/c/trusted/ppb_broker_trusted.h"
80 #include "ppapi/c/trusted/ppb_buffer_trusted.h" 80 #include "ppapi/c/trusted/ppb_buffer_trusted.h"
81 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h" 81 #include "ppapi/c/trusted/ppb_file_chooser_trusted.h"
82 #include "ppapi/c/trusted/ppb_file_io_trusted.h" 82 #include "ppapi/c/trusted/ppb_file_io_trusted.h"
83 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h" 83 #include "ppapi/c/trusted/ppb_graphics_3d_trusted.h"
84 #include "ppapi/c/trusted/ppb_image_data_trusted.h" 84 #include "ppapi/c/trusted/ppb_image_data_trusted.h"
85 #include "ppapi/c/trusted/ppb_url_loader_trusted.h" 85 #include "ppapi/c/trusted/ppb_url_loader_trusted.h"
86 #include "ppapi/shared_impl/ppb_input_event_shared.h" 86 #include "ppapi/shared_impl/input_event_impl.h"
87 #include "ppapi/shared_impl/ppb_opengles2_shared.h"
88 #include "ppapi/shared_impl/time_conversion.h" 87 #include "ppapi/shared_impl/time_conversion.h"
89 #include "ppapi/thunk/enter.h" 88 #include "ppapi/thunk/enter.h"
90 #include "ppapi/thunk/thunk.h" 89 #include "ppapi/thunk/thunk.h"
91 #include "webkit/plugins/plugin_switches.h" 90 #include "webkit/plugins/plugin_switches.h"
92 #include "webkit/plugins/ppapi/callbacks.h" 91 #include "webkit/plugins/ppapi/callbacks.h"
93 #include "webkit/plugins/ppapi/common.h" 92 #include "webkit/plugins/ppapi/common.h"
94 #include "webkit/plugins/ppapi/host_globals.h" 93 #include "webkit/plugins/ppapi/host_globals.h"
95 #include "webkit/plugins/ppapi/host_resource_tracker.h" 94 #include "webkit/plugins/ppapi/host_resource_tracker.h"
96 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 95 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
97 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 96 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
98 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h" 97 #include "webkit/plugins/ppapi/ppb_directory_reader_impl.h"
99 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h" 98 #include "webkit/plugins/ppapi/ppb_flash_clipboard_impl.h"
100 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h" 99 #include "webkit/plugins/ppapi/ppb_flash_file_impl.h"
101 #include "webkit/plugins/ppapi/ppb_flash_impl.h" 100 #include "webkit/plugins/ppapi/ppb_flash_impl.h"
102 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h" 101 #include "webkit/plugins/ppapi/ppb_flash_menu_impl.h"
103 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h" 102 #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
104 #include "webkit/plugins/ppapi/ppb_font_impl.h" 103 #include "webkit/plugins/ppapi/ppb_font_impl.h"
105 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h" 104 #include "webkit/plugins/ppapi/ppb_gpu_blacklist_private_impl.h"
106 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h" 105 #include "webkit/plugins/ppapi/ppb_graphics_2d_impl.h"
107 #include "webkit/plugins/ppapi/ppb_image_data_impl.h" 106 #include "webkit/plugins/ppapi/ppb_image_data_impl.h"
108 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h" 107 #include "webkit/plugins/ppapi/ppb_layer_compositor_impl.h"
108 #include "webkit/plugins/ppapi/ppb_opengles_impl.h"
109 #include "webkit/plugins/ppapi/ppb_proxy_impl.h" 109 #include "webkit/plugins/ppapi/ppb_proxy_impl.h"
110 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h" 110 #include "webkit/plugins/ppapi/ppb_scrollbar_impl.h"
111 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h" 111 #include "webkit/plugins/ppapi/ppb_uma_private_impl.h"
112 #include "webkit/plugins/ppapi/ppb_var_impl.h" 112 #include "webkit/plugins/ppapi/ppb_var_impl.h"
113 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h" 113 #include "webkit/plugins/ppapi/ppb_video_capture_impl.h"
114 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h" 114 #include "webkit/plugins/ppapi/ppb_video_decoder_impl.h"
115 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h" 115 #include "webkit/plugins/ppapi/ppb_video_layer_impl.h"
116 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h" 116 #include "webkit/plugins/ppapi/webkit_forwarding_impl.h"
117 117
118 using ppapi::InputEventData; 118 using ppapi::InputEventData;
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 return PPB_GpuBlacklist_Private_Impl::GetInterface(); 307 return PPB_GpuBlacklist_Private_Impl::GetInterface();
308 if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0) 308 if (strcmp(name, PPB_GRAPHICS_3D_TRUSTED_INTERFACE) == 0)
309 return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk(); 309 return ::ppapi::thunk::GetPPB_Graphics3DTrusted_Thunk();
310 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0) 310 if (strcmp(name, PPB_IMAGEDATA_TRUSTED_INTERFACE) == 0)
311 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk(); 311 return ::ppapi::thunk::GetPPB_ImageDataTrusted_Thunk();
312 if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0) 312 if (strcmp(name, PPB_INPUT_EVENT_INTERFACE_1_0) == 0)
313 return ::ppapi::thunk::GetPPB_InputEvent_Thunk(); 313 return ::ppapi::thunk::GetPPB_InputEvent_Thunk();
314 if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0) 314 if (strcmp(name, PPB_INSTANCE_PRIVATE_INTERFACE) == 0)
315 return ::ppapi::thunk::GetPPB_Instance_Private_Thunk(); 315 return ::ppapi::thunk::GetPPB_Instance_Private_Thunk();
316 if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0) 316 if (strcmp(name, PPB_OPENGLES2_INTERFACE) == 0)
317 return ::ppapi::PPB_OpenGLES2_Shared::GetInterface(); 317 return PPB_OpenGLES_Impl::GetInterface();
318 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0) 318 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
319 return PPB_Proxy_Impl::GetInterface(); 319 return PPB_Proxy_Impl::GetInterface();
320 if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0) 320 if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0)
321 return PPB_UMA_Private_Impl::GetInterface(); 321 return PPB_UMA_Private_Impl::GetInterface();
322 if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0) 322 if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)
323 return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk(); 323 return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk();
324 if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0) 324 if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
325 return PPB_Var_Impl::GetVarDeprecatedInterface(); 325 return PPB_Var_Impl::GetVarDeprecatedInterface();
326 if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0) 326 if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0)
327 return PPB_Var_Impl::GetVarInterface(); 327 return PPB_Var_Impl::GetVarInterface();
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
573 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 573 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
574 if (retval != 0) { 574 if (retval != 0) {
575 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 575 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
576 return false; 576 return false;
577 } 577 }
578 return true; 578 return true;
579 } 579 }
580 580
581 } // namespace ppapi 581 } // namespace ppapi
582 } // namespace webkit 582 } // namespace webkit
OLDNEW
« no previous file with comments | « webkit/glue/webkit_glue.gypi ('k') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698