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

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

Issue 8870002: Apply renaming of ppapi shared stuff to new ppb_var shared code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix header guard 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 | « ppapi/shared_impl/ppb_var_shared.cc ('k') | webkit/plugins/ppapi/ppb_var_deprecated_impl.cc » ('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 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/ppb_input_event_shared.h"
87 #include "ppapi/shared_impl/ppb_opengles2_shared.h" 87 #include "ppapi/shared_impl/ppb_opengles2_shared.h"
88 #include "ppapi/shared_impl/ppb_var_impl.h" 88 #include "ppapi/shared_impl/ppb_var_shared.h"
89 #include "ppapi/shared_impl/time_conversion.h" 89 #include "ppapi/shared_impl/time_conversion.h"
90 #include "ppapi/thunk/enter.h" 90 #include "ppapi/thunk/enter.h"
91 #include "ppapi/thunk/thunk.h" 91 #include "ppapi/thunk/thunk.h"
92 #include "webkit/plugins/plugin_switches.h" 92 #include "webkit/plugins/plugin_switches.h"
93 #include "webkit/plugins/ppapi/callbacks.h" 93 #include "webkit/plugins/ppapi/callbacks.h"
94 #include "webkit/plugins/ppapi/common.h" 94 #include "webkit/plugins/ppapi/common.h"
95 #include "webkit/plugins/ppapi/host_globals.h" 95 #include "webkit/plugins/ppapi/host_globals.h"
96 #include "webkit/plugins/ppapi/host_resource_tracker.h" 96 #include "webkit/plugins/ppapi/host_resource_tracker.h"
97 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 97 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
98 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h" 98 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 return ::ppapi::PPB_OpenGLES2_Shared::GetInterface(); 318 return ::ppapi::PPB_OpenGLES2_Shared::GetInterface();
319 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0) 319 if (strcmp(name, PPB_PROXY_PRIVATE_INTERFACE) == 0)
320 return PPB_Proxy_Impl::GetInterface(); 320 return PPB_Proxy_Impl::GetInterface();
321 if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0) 321 if (strcmp(name, PPB_UMA_PRIVATE_INTERFACE) == 0)
322 return PPB_UMA_Private_Impl::GetInterface(); 322 return PPB_UMA_Private_Impl::GetInterface();
323 if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0) 323 if (strcmp(name, PPB_URLLOADERTRUSTED_INTERFACE) == 0)
324 return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk(); 324 return ::ppapi::thunk::GetPPB_URLLoaderTrusted_Thunk();
325 if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0) 325 if (strcmp(name, PPB_VAR_DEPRECATED_INTERFACE) == 0)
326 return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface(); 326 return PPB_Var_Deprecated_Impl::GetVarDeprecatedInterface();
327 if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0) 327 if (strcmp(name, PPB_VAR_INTERFACE_1_0) == 0)
328 return ::ppapi::PPB_Var_Impl::GetVarInterface1_0(); 328 return ::ppapi::PPB_Var_Shared::GetVarInterface1_0();
329 if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0) 329 if (strcmp(name, PPB_VAR_INTERFACE_1_1) == 0)
330 return ::ppapi::PPB_Var_Impl::GetVarInterface(); 330 return ::ppapi::PPB_Var_Shared::GetVarInterface();
331 331
332 #ifdef ENABLE_FLAPPER_HACKS 332 #ifdef ENABLE_FLAPPER_HACKS
333 if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0) 333 if (strcmp(name, PPB_FLASH_NETCONNECTOR_INTERFACE) == 0)
334 return ::ppapi::thunk::GetPPB_Flash_NetConnector_Thunk(); 334 return ::ppapi::thunk::GetPPB_Flash_NetConnector_Thunk();
335 #endif // ENABLE_FLAPPER_HACKS 335 #endif // ENABLE_FLAPPER_HACKS
336 336
337 // Only support the testing interface when the command line switch is 337 // Only support the testing interface when the command line switch is
338 // specified. This allows us to prevent people from (ab)using this interface 338 // specified. This allows us to prevent people from (ab)using this interface
339 // in production code. 339 // in production code.
340 if (CommandLine::ForCurrentProcess()->HasSwitch( 340 if (CommandLine::ForCurrentProcess()->HasSwitch(
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
576 int retval = entry_points.initialize_module(pp_module(), &GetInterface); 576 int retval = entry_points.initialize_module(pp_module(), &GetInterface);
577 if (retval != 0) { 577 if (retval != 0) {
578 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval; 578 LOG(WARNING) << "PPP_InitializeModule returned failure " << retval;
579 return false; 579 return false;
580 } 580 }
581 return true; 581 return true;
582 } 582 }
583 583
584 } // namespace ppapi 584 } // namespace ppapi
585 } // namespace webkit 585 } // namespace webkit
OLDNEW
« no previous file with comments | « ppapi/shared_impl/ppb_var_shared.cc ('k') | webkit/plugins/ppapi/ppb_var_deprecated_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698