| Index: webkit/glue/webkit_glue.gypi
 | 
| ===================================================================
 | 
| --- webkit/glue/webkit_glue.gypi	(revision 69765)
 | 
| +++ webkit/glue/webkit_glue.gypi	(working copy)
 | 
| @@ -168,75 +168,6 @@
 | 
|          # This list contains all .h, .cc, and .mm files in glue except for
 | 
|          # those in the test subdirectory and those with unittest in in their
 | 
|          # names.
 | 
| -        '../plugins/npapi/carbon_plugin_window_tracker_mac.cc',
 | 
| -        '../plugins/npapi/carbon_plugin_window_tracker_mac.h',
 | 
| -        '../plugins/npapi/coregraphics_private_symbols_mac.h',
 | 
| -        '../plugins/npapi/default_plugin_shared.h',
 | 
| -        '../plugins/npapi/gtk_plugin_container.cc',
 | 
| -        '../plugins/npapi/gtk_plugin_container.h',
 | 
| -        '../plugins/npapi/gtk_plugin_container_manager.cc',
 | 
| -        '../plugins/npapi/gtk_plugin_container_manager.h',
 | 
| -        '../plugins/npapi/npapi_extension_thunk.cc',
 | 
| -        '../plugins/npapi/npapi_extension_thunk.h',
 | 
| -        '../plugins/npapi/nphostapi.h',
 | 
| -        '../plugins/npapi/plugin_constants_win.cc',
 | 
| -        '../plugins/npapi/plugin_constants_win.h',
 | 
| -        '../plugins/npapi/plugin_group.cc',
 | 
| -        '../plugins/npapi/plugin_group.h',
 | 
| -        '../plugins/npapi/plugin_host.cc',
 | 
| -        '../plugins/npapi/plugin_host.h',
 | 
| -        '../plugins/npapi/plugin_instance.cc',
 | 
| -        '../plugins/npapi/plugin_instance.h',
 | 
| -        '../plugins/npapi/plugin_instance_mac.mm',
 | 
| -        '../plugins/npapi/plugin_lib.cc',
 | 
| -        '../plugins/npapi/plugin_lib.h',
 | 
| -        '../plugins/npapi/plugin_lib_mac.mm',
 | 
| -        '../plugins/npapi/plugin_lib_posix.cc',
 | 
| -        '../plugins/npapi/plugin_lib_win.cc',
 | 
| -        '../plugins/npapi/plugin_list.cc',
 | 
| -        '../plugins/npapi/plugin_list.h',
 | 
| -        '../plugins/npapi/plugin_list_mac.mm',
 | 
| -        '../plugins/npapi/plugin_list_posix.cc',
 | 
| -        '../plugins/npapi/plugin_list_win.cc',
 | 
| -        '../plugins/npapi/plugin_stream.cc',
 | 
| -        '../plugins/npapi/plugin_stream.h',
 | 
| -        '../plugins/npapi/plugin_stream_posix.cc',
 | 
| -        '../plugins/npapi/plugin_stream_url.cc',
 | 
| -        '../plugins/npapi/plugin_stream_url.h',
 | 
| -        '../plugins/npapi/plugin_stream_win.cc',
 | 
| -        '../plugins/npapi/plugin_string_stream.cc',
 | 
| -        '../plugins/npapi/plugin_string_stream.h',
 | 
| -        '../plugins/npapi/plugin_web_event_converter_mac.h',
 | 
| -        '../plugins/npapi/plugin_web_event_converter_mac.mm',
 | 
| -        '../plugins/npapi/ppb_private.h',
 | 
| -        '../plugins/npapi/quickdraw_drawing_manager_mac.cc',
 | 
| -        '../plugins/npapi/quickdraw_drawing_manager_mac.h',
 | 
| -        '../plugins/npapi/webplugin.cc',
 | 
| -        '../plugins/npapi/webplugin.h',
 | 
| -        '../plugins/npapi/webplugin_2d_device_delegate.cc',
 | 
| -        '../plugins/npapi/webplugin_2d_device_delegate.h',
 | 
| -        '../plugins/npapi/webplugin_3d_device_delegate.cc',
 | 
| -        '../plugins/npapi/webplugin_3d_device_delegate.h',
 | 
| -        '../plugins/npapi/webplugin_accelerated_surface_mac.h',
 | 
| -        '../plugins/npapi/webplugin_audio_device_delegate.cc',
 | 
| -        '../plugins/npapi/webplugin_audio_device_delegate.h',
 | 
| -        '../plugins/npapi/webplugin_delegate.cc',
 | 
| -        '../plugins/npapi/webplugin_delegate.h',
 | 
| -        '../plugins/npapi/webplugin_delegate_impl.cc',
 | 
| -        '../plugins/npapi/webplugin_delegate_impl.h',
 | 
| -        '../plugins/npapi/webplugin_delegate_impl_gtk.cc',
 | 
| -        '../plugins/npapi/webplugin_delegate_impl_mac.mm',
 | 
| -        '../plugins/npapi/webplugin_delegate_impl_win.cc',
 | 
| -        '../plugins/npapi/webplugin_file_delegate.cc',
 | 
| -        '../plugins/npapi/webplugin_file_delegate.h',
 | 
| -        '../plugins/npapi/webplugin_impl.cc',
 | 
| -        '../plugins/npapi/webplugin_impl.h',
 | 
| -        '../plugins/npapi/webplugin_print_delegate.cc',
 | 
| -        '../plugins/npapi/webplugin_print_delegate.h',
 | 
| -        '../plugins/npapi/webplugininfo.cc',
 | 
| -        '../plugins/npapi/webplugininfo.h',
 | 
| -        '../plugins/npapi/webview_plugin.cc',
 | 
| -        '../plugins/npapi/webview_plugin.h',
 | 
|          '../plugins/plugin_switches.cc',
 | 
|          '../plugins/plugin_switches.h',
 | 
|          '../plugins/ppapi/common.h',
 | 
| @@ -251,14 +182,14 @@
 | 
|          '../plugins/ppapi/npapi_glue.cc',
 | 
|          '../plugins/ppapi/npapi_glue.h',
 | 
|          '../plugins/ppapi/plugin_delegate.h',
 | 
| +        '../plugins/ppapi/ppapi_plugin_instance.cc',
 | 
| +        '../plugins/ppapi/ppapi_plugin_instance.h',
 | 
| +        '../plugins/ppapi/ppapi_webplugin_impl.cc',
 | 
| +        '../plugins/ppapi/ppapi_webplugin_impl.h',
 | 
|          '../plugins/ppapi/plugin_module.cc',
 | 
|          '../plugins/ppapi/plugin_module.h',
 | 
|          '../plugins/ppapi/plugin_object.cc',
 | 
|          '../plugins/ppapi/plugin_object.h',
 | 
| -        '../plugins/ppapi/ppapi_plugin_instance.cc',
 | 
| -        '../plugins/ppapi/ppapi_plugin_instance.h',
 | 
| -        '../plugins/ppapi/ppapi_webplugin_impl.cc',
 | 
| -        '../plugins/ppapi/ppapi_webplugin_impl.h',
 | 
|          '../plugins/ppapi/ppb_audio_impl.cc',
 | 
|          '../plugins/ppapi/ppb_audio_impl.h',
 | 
|          '../plugins/ppapi/ppb_buffer_impl.cc',
 | 
| @@ -334,6 +265,75 @@
 | 
|          'media/web_data_source.cc',
 | 
|          'media/web_data_source.h',
 | 
|          'media/web_video_renderer.h',
 | 
| +        'plugins/carbon_plugin_window_tracker_mac.h',
 | 
| +        'plugins/carbon_plugin_window_tracker_mac.cc',
 | 
| +        'plugins/coregraphics_private_symbols_mac.h',
 | 
| +        'plugins/default_plugin_shared.h',
 | 
| +        'plugins/nphostapi.h',
 | 
| +        'plugins/gtk_plugin_container.h',
 | 
| +        'plugins/gtk_plugin_container.cc',
 | 
| +        'plugins/gtk_plugin_container_manager.h',
 | 
| +        'plugins/gtk_plugin_container_manager.cc',
 | 
| +        'plugins/npapi_extension_thunk.cc',
 | 
| +        'plugins/npapi_extension_thunk.h',
 | 
| +        'plugins/plugin_constants_win.h',
 | 
| +        'plugins/plugin_group.cc',
 | 
| +        'plugins/plugin_group.h',
 | 
| +        'plugins/plugin_host.cc',
 | 
| +        'plugins/plugin_host.h',
 | 
| +        'plugins/plugin_instance.cc',
 | 
| +        'plugins/plugin_instance.h',
 | 
| +        'plugins/plugin_instance_mac.mm',
 | 
| +        'plugins/plugin_lib.cc',
 | 
| +        'plugins/plugin_lib.h',
 | 
| +        'plugins/plugin_lib_mac.mm',
 | 
| +        'plugins/plugin_lib_posix.cc',
 | 
| +        'plugins/plugin_lib_win.cc',
 | 
| +        'plugins/plugin_list.cc',
 | 
| +        'plugins/plugin_list.h',
 | 
| +        'plugins/plugin_list_mac.mm',
 | 
| +        'plugins/plugin_list_posix.cc',
 | 
| +        'plugins/plugin_list_win.cc',
 | 
| +        'plugins/plugin_stream.cc',
 | 
| +        'plugins/plugin_stream.h',
 | 
| +        'plugins/plugin_stream_posix.cc',
 | 
| +        'plugins/plugin_stream_url.cc',
 | 
| +        'plugins/plugin_stream_url.h',
 | 
| +        'plugins/plugin_stream_win.cc',
 | 
| +        'plugins/plugin_string_stream.cc',
 | 
| +        'plugins/plugin_string_stream.h',
 | 
| +        'plugins/plugin_stubs.cc',
 | 
| +        'plugins/plugin_web_event_converter_mac.h',
 | 
| +        'plugins/plugin_web_event_converter_mac.mm',
 | 
| +        'plugins/ppb_private.h',
 | 
| +        'plugins/quickdraw_drawing_manager_mac.h',
 | 
| +        'plugins/quickdraw_drawing_manager_mac.cc',
 | 
| +        'plugins/webview_plugin.cc',
 | 
| +        'plugins/webview_plugin.h',
 | 
| +        'plugins/webplugin.cc',
 | 
| +        'plugins/webplugin.h',
 | 
| +        'plugins/webplugin_audio_device_delegate.cc',
 | 
| +        'plugins/webplugin_audio_device_delegate.h',
 | 
| +        'plugins/webplugin_2d_device_delegate.cc',
 | 
| +        'plugins/webplugin_2d_device_delegate.h',
 | 
| +        'plugins/webplugin_3d_device_delegate.cc',
 | 
| +        'plugins/webplugin_3d_device_delegate.h',
 | 
| +        'plugins/webplugin_accelerated_surface_mac.h',
 | 
| +        'plugins/webplugin_delegate.cc',
 | 
| +        'plugins/webplugin_delegate.h',
 | 
| +        'plugins/webplugin_delegate_impl.cc',
 | 
| +        'plugins/webplugin_delegate_impl.h',
 | 
| +        'plugins/webplugin_delegate_impl_gtk.cc',
 | 
| +        'plugins/webplugin_delegate_impl_mac.mm',
 | 
| +        'plugins/webplugin_delegate_impl_win.cc',
 | 
| +        'plugins/webplugin_file_delegate.cc',
 | 
| +        'plugins/webplugin_file_delegate.h',
 | 
| +        'plugins/webplugin_impl.cc',
 | 
| +        'plugins/webplugin_impl.h',
 | 
| +        'plugins/webplugin_print_delegate.cc',
 | 
| +        'plugins/webplugin_print_delegate.h',
 | 
| +        'plugins/webplugininfo.cc',
 | 
| +        'plugins/webplugininfo.h',
 | 
|          'alt_error_page_resource_fetcher.cc',
 | 
|          'alt_error_page_resource_fetcher.h',
 | 
|          'context_menu.cc',
 | 
| 
 |