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

Unified Diff: content/content_renderer.gypi

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/pepper_plugin_registry.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_renderer.gypi
===================================================================
--- content/content_renderer.gypi (revision 213561)
+++ content/content_renderer.gypi (working copy)
@@ -46,6 +46,7 @@
'public/renderer/navigation_state.cc',
'public/renderer/navigation_state.h',
'public/renderer/password_form_conversion_utils.h',
+ 'public/renderer/ppapi_plugin_instance.h',
'public/renderer/renderer_ppapi_host.h',
'public/renderer/render_frame.h',
'public/renderer/render_process_observer.cc',
@@ -258,8 +259,29 @@
'renderer/paint_aggregator.cc',
'renderer/paint_aggregator.h',
'renderer/password_form_conversion_utils.cc',
+ 'renderer/pepper/audio_helper.cc',
+ 'renderer/pepper/audio_helper.h',
+ 'renderer/pepper/common.h',
+ 'renderer/pepper/content_decryptor_delegate.cc',
+ 'renderer/pepper/content_decryptor_delegate.h',
'renderer/pepper/content_renderer_pepper_host_factory.cc',
'renderer/pepper/content_renderer_pepper_host_factory.h',
+ 'renderer/pepper/event_conversion.cc',
+ 'renderer/pepper/event_conversion.h',
+ 'renderer/pepper/fullscreen_container.h',
+ 'renderer/pepper/gfx_conversion.h',
+ 'renderer/pepper/host_array_buffer_var.cc',
+ 'renderer/pepper/host_array_buffer_var.h',
+ 'renderer/pepper/host_globals.cc',
+ 'renderer/pepper/host_globals.h',
+ 'renderer/pepper/host_var_tracker.cc',
+ 'renderer/pepper/host_var_tracker.h',
+ 'renderer/pepper/message_channel.cc',
+ 'renderer/pepper/message_channel.h',
+ 'renderer/pepper/npapi_glue.cc',
+ 'renderer/pepper/npapi_glue.h',
+ 'renderer/pepper/npobject_var.cc',
+ 'renderer/pepper/npobject_var.h',
'renderer/pepper/pepper_audio_input_host.cc',
'renderer/pepper/pepper_audio_input_host.h',
'renderer/pepper/pepper_broker_impl.cc',
@@ -311,10 +333,72 @@
'renderer/pepper/pepper_video_capture_host.h',
'renderer/pepper/pepper_websocket_host.cc',
'renderer/pepper/pepper_websocket_host.h',
+ 'renderer/pepper/plugin_delegate.h',
+ 'renderer/pepper/plugin_module.cc',
+ 'renderer/pepper/plugin_module.h',
+ 'renderer/pepper/plugin_object.cc',
+ 'renderer/pepper/plugin_object.h',
+ 'renderer/pepper/ppapi_interface_factory.cc',
+ 'renderer/pepper/ppapi_interface_factory.h',
+ 'renderer/pepper/ppapi_plugin_instance_impl.cc',
+ 'renderer/pepper/ppapi_plugin_instance_impl.h',
+ 'renderer/pepper/ppapi_webplugin_impl.cc',
+ 'renderer/pepper/ppapi_webplugin_impl.h',
+ 'renderer/pepper/ppb_audio_impl.cc',
+ 'renderer/pepper/ppb_audio_impl.h',
+ 'renderer/pepper/ppb_broker_impl.cc',
+ 'renderer/pepper/ppb_broker_impl.h',
+ 'renderer/pepper/ppb_buffer_impl.cc',
+ 'renderer/pepper/ppb_buffer_impl.h',
+ 'renderer/pepper/ppb_file_ref_impl.cc',
+ 'renderer/pepper/ppb_file_ref_impl.h',
+ 'renderer/pepper/ppb_flash_message_loop_impl.cc',
+ 'renderer/pepper/ppb_flash_message_loop_impl.h',
+ 'renderer/pepper/ppb_gpu_blacklist_private_impl.cc',
+ 'renderer/pepper/ppb_gpu_blacklist_private_impl.h',
+ 'renderer/pepper/ppb_graphics_3d_impl.cc',
+ 'renderer/pepper/ppb_graphics_3d_impl.h',
+ 'renderer/pepper/ppb_image_data_impl.cc',
+ 'renderer/pepper/ppb_image_data_impl.h',
+ 'renderer/pepper/ppb_network_monitor_private_impl.cc',
+ 'renderer/pepper/ppb_network_monitor_private_impl.h',
+ 'renderer/pepper/ppb_proxy_impl.cc',
+ 'renderer/pepper/ppb_proxy_impl.h',
+ 'renderer/pepper/ppb_scrollbar_impl.cc',
+ 'renderer/pepper/ppb_scrollbar_impl.h',
+ 'renderer/pepper/ppb_tcp_server_socket_private_impl.cc',
+ 'renderer/pepper/ppb_tcp_server_socket_private_impl.h',
+ 'renderer/pepper/ppb_tcp_socket_private_impl.cc',
+ 'renderer/pepper/ppb_tcp_socket_private_impl.h',
+ 'renderer/pepper/ppb_uma_private_impl.cc',
+ 'renderer/pepper/ppb_uma_private_impl.h',
+ 'renderer/pepper/ppb_var_deprecated_impl.cc',
+ 'renderer/pepper/ppb_var_deprecated_impl.h',
+ 'renderer/pepper/ppb_video_decoder_impl.cc',
+ 'renderer/pepper/ppb_video_decoder_impl.h',
+ 'renderer/pepper/ppb_widget_impl.cc',
+ 'renderer/pepper/ppb_widget_impl.h',
+ 'renderer/pepper/ppb_x509_certificate_private_impl.cc',
+ 'renderer/pepper/ppb_x509_certificate_private_impl.h',
+ 'renderer/pepper/quota_file_io.cc',
+ 'renderer/pepper/quota_file_io.h',
'renderer/pepper/renderer_ppapi_host_impl.cc',
'renderer/pepper/renderer_ppapi_host_impl.h',
+ 'renderer/pepper/resource_creation_impl.cc',
+ 'renderer/pepper/resource_creation_impl.h',
+ 'renderer/pepper/resource_helper.cc',
+ 'renderer/pepper/resource_helper.h',
+ 'renderer/pepper/url_request_info_util.cc',
+ 'renderer/pepper/url_request_info_util.h',
'renderer/pepper/url_response_info_util.cc',
'renderer/pepper/url_response_info_util.h',
+ 'renderer/pepper/usb_key_code_conversion.h',
+ 'renderer/pepper/usb_key_code_conversion.cc',
+ 'renderer/pepper/usb_key_code_conversion_linux.cc',
+ 'renderer/pepper/usb_key_code_conversion_mac.cc',
+ 'renderer/pepper/usb_key_code_conversion_win.cc',
+ 'renderer/pepper/v8_var_converter.cc',
+ 'renderer/pepper/v8_var_converter.h',
'renderer/plugin_channel_host.cc',
'renderer/plugin_channel_host.h',
'renderer/browser_plugin/browser_plugin.cc',
@@ -601,6 +685,13 @@
'renderer/media/crypto/ppapi_decryptor.h',
],
}],
+ ['enable_gpu!=1', {
+ 'sources!': [
+ 'renderer/pepper/ppb_graphics_3d_impl.cc',
+ 'renderer/pepper/ppb_graphics_3d_impl.h',
+ 'renderer/pepper/ppb_open_gl_es_impl.cc',
+ ],
+ }],
],
'target_conditions': [
['OS=="android"', {
« no previous file with comments | « content/common/pepper_plugin_registry.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698