diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:13:47 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-19 01:13:47 +0000 |
commit | 29e2fb456d3bf933168cf24bccaf05b1bea862fc (patch) | |
tree | 43eacb9a2201da4c6eaaa658facf35f9addd2a5b /content/content_child.gypi | |
parent | 83aa2eda2999b74dab6cb22d677acaaefa044da7 (diff) | |
download | chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.zip chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.tar.gz chromium_src-29e2fb456d3bf933168cf24bccaf05b1bea862fc.tar.bz2 |
Move NPAPI implementation out of webkit/plugins/npapi and into content.
Notes:
-gtk_plugin_container_manager* and gtk_plugin_container* move to content/browser/renderer_host/ since that's all where they're used
-plugin_list* and plugin_constants_win* move to content/common as they're used by child processes and the browser
-webplugin_impl* and webplugin_page_delegate.h move to content/renderer as that's where they're used. I will remove webplugin_page_delegate.h in a followup change as it's no longer needed.
-the rest moves to content/child/npapi
-a few constants moved from plugin_constants_win.h to plugin_util.h temporarily
BUG=237249
TBR=scottmg
Review URL: https://codereview.chromium.org/19761007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_child.gypi')
-rw-r--r-- | content/content_child.gypi | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/content/content_child.gypi b/content/content_child.gypi index c433215..062bbb5 100644 --- a/content/content_child.gypi +++ b/content/content_child.gypi @@ -55,6 +55,35 @@ 'child/indexed_db/proxy_webidbdatabase_impl.h', 'child/indexed_db/proxy_webidbfactory_impl.cc', 'child/indexed_db/proxy_webidbfactory_impl.h', + 'child/npapi/plugin_host.cc', + 'child/npapi/plugin_host.h', + 'child/npapi/plugin_instance.cc', + 'child/npapi/plugin_instance.h', + 'child/npapi/plugin_instance_mac.mm', + 'child/npapi/plugin_lib.cc', + 'child/npapi/plugin_lib.h', + 'child/npapi/plugin_stream.cc', + 'child/npapi/plugin_stream.h', + 'child/npapi/plugin_stream_posix.cc', + 'child/npapi/plugin_stream_url.cc', + 'child/npapi/plugin_stream_url.h', + 'child/npapi/plugin_stream_win.cc', + 'child/npapi/plugin_string_stream.cc', + 'child/npapi/plugin_string_stream.h', + 'child/npapi/plugin_web_event_converter_mac.h', + 'child/npapi/plugin_web_event_converter_mac.mm', + 'child/npapi/webplugin.h', + 'child/npapi/webplugin_accelerated_surface_mac.h', + 'child/npapi/webplugin_delegate.h', + 'child/npapi/webplugin_delegate_impl.cc', + 'child/npapi/webplugin_delegate_impl.h', + 'child/npapi/webplugin_delegate_impl_android.cc', + 'child/npapi/webplugin_delegate_impl_aura.cc', + 'child/npapi/webplugin_delegate_impl_gtk.cc', + 'child/npapi/webplugin_delegate_impl_mac.mm', + 'child/npapi/webplugin_delegate_impl_win.cc', + 'child/npapi/webplugin_ime_win.cc', + 'child/npapi/webplugin_ime_win.h', 'child/np_channel_base.cc', 'child/np_channel_base.h', 'child/npobject_base.h', @@ -112,5 +141,15 @@ '../webkit/support/webkit_support.gyp:glue_child', ], }], + ['use_aura==1', { + 'sources!': [ + 'child/npapi/webplugin_delegate_impl_mac.mm', + ], + }], + ['use_aura==1 and OS=="win"', { + 'sources!': [ + 'child/npapi/webplugin_delegate_impl_aura.cc', + ], + }], ], } |