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

Unified Diff: content/content_child.gypi

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac 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
Index: content/content_child.gypi
===================================================================
--- content/content_child.gypi (revision 212369)
+++ content/content_child.gypi (working copy)
@@ -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',
+ ],
+ }],
],
}

Powered by Google App Engine
This is Rietveld 408576698