Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

webkit/glue/plugins/webview_plugin.h

Index: webkit/glue/plugins/webview_plugin.h
diff --git a/webkit/plugins/npapi/webview_plugin.h b/webkit/glue/plugins/webview_plugin.h
similarity index 93%
rename from webkit/plugins/npapi/webview_plugin.h
rename to webkit/glue/plugins/webview_plugin.h
index 5e2fd20df785ae08ca35290984802a224ff8d0c1..f3c75c18b6ebfe0c8c9b42092b2c5d28610e8b6f 100644
--- a/webkit/plugins/npapi/webview_plugin.h
+++ b/webkit/glue/plugins/webview_plugin.h
@@ -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_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_
+#ifndef WEBKIT_GLUE_PLUGINS_WEBVIEW_PLUGIN_H_
+#define WEBKIT_GLUE_PLUGINS_WEBVIEW_PLUGIN_H_
 
 #include <list>
 
@@ -22,9 +22,6 @@ class WebMouseEvent;
 }
 struct WebPreferences;
 
-namespace webkit {
-namespace npapi {
-
 // This class implements the WebPlugin interface by forwarding drawing and
 // handling input events to a WebView.
 // It can be used as a placeholder for an actual plugin, using HTML for the UI.
@@ -82,8 +79,8 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient,
       const WebKit::WebRect& frame_rect, const WebKit::WebRect& clip_rect,
       const WebKit::WebVector<WebKit::WebRect>& cut_out_rects, bool is_visible);
 
-  virtual void updateFocus(bool) {}
-  virtual void updateVisibility(bool) {}
+  virtual void updateFocus(bool) { }
+  virtual void updateVisibility(bool) { }
 
   virtual bool acceptsInputEvents();
   virtual bool handleInputEvent(const WebKit::WebInputEvent& event,
@@ -96,10 +93,10 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient,
 
   // Called in response to WebPluginContainer::loadFrameRequest
   virtual void didFinishLoadingFrameRequest(
-      const WebKit::WebURL& url, void* notifyData) {}
+      const WebKit::WebURL& url, void* notifyData) { }
   virtual void didFailLoadingFrameRequest(const WebKit::WebURL& url,
                                           void* notify_data,
-                                          const WebKit::WebURLError& error) {}
+                                          const WebKit::WebURLError& error) { }
 
   // WebViewClient methods:
   virtual bool acceptsLoadDrops();
@@ -142,7 +139,4 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient,
   WebKit::WebString old_title_;
 };
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_
+#endif  // WEBKIT_GLUE_PLUGINS_WEBVIEW_PLUGIN_H_