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

webkit/plugins/npapi/gtk_plugin_container_manager.h

Index: webkit/plugins/npapi/gtk_plugin_container_manager.h
===================================================================
--- webkit/plugins/npapi/gtk_plugin_container_manager.h	(revision 0)
+++ webkit/plugins/npapi/gtk_plugin_container_manager.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_MANAGER_H_
-#define WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_MANAGER_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_MANAGER_H_
+#define WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_MANAGER_H_
 
 #include <gtk/gtk.h>
 #include <map>
@@ -12,9 +12,10 @@
 
 typedef struct _GtkWidget GtkWidget;
 
-namespace webkit_glue {
+namespace webkit {
+namespace npapi {
+
 struct WebPluginGeometry;
-}
 
 // Helper class that creates and manages plugin containers (GtkSocket).
 class GtkPluginContainerManager {
@@ -33,7 +34,7 @@
 
   // Takes an update from WebKit about a plugin's position and side and moves
   // the plugin accordingly.
-  void MovePluginContainer(const webkit_glue::WebPluginGeometry& move);
+  void MovePluginContainer(const WebPluginGeometry& move);
 
  private:
   // Maps a plugin XID to the corresponding container widget.
@@ -54,4 +55,7 @@
   PluginWindowToWidgetMap plugin_window_to_widget_map_;
 };
 
-#endif  // WEBKIT_GLUE_PLUGINS_GTK_PLUGIN_CONTAINER_MANAGER_H_
+}  // namespace npapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_NPAPI_GTK_PLUGIN_CONTAINER_MANAGER_H_