Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/gtk_plugin_container.h

Index: webkit/plugins/npapi/gtk_plugin_container.h
===================================================================
--- webkit/plugins/npapi/gtk_plugin_container.h	(revision 0)
+++ webkit/plugins/npapi/gtk_plugin_container.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_H_
-#define WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_
+#define WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_
 
 // Windowed plugins are embedded via XEmbed, which is implemented by
 // GtkPlug/GtkSocket.  But we want to control sizing and positioning
@@ -15,6 +15,9 @@
 
 typedef struct _GtkWidget GtkWidget;
 
+namespace webkit {
+namespace npapi {
+
 // Return a new GtkPluginContainer.
 // Intentionally GTK-style here since we're creating a custom GTK widget.
 // This is a GtkSocket subclass; see its documentation for available methods.
@@ -23,4 +26,7 @@
 // Sets the size of the GtkPluginContainer.
 void gtk_plugin_container_set_size(GtkWidget *widget, int width, int height);
 
-#endif  // WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_H_
+}  // namespace npapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_H_