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

webkit/plugins/npapi/webview_plugin.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_WEBVIEW_PLUGIN_H_
-#define WEBKIT_GLUE_PLUGINS_WEBVIEW_PLUGIN_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_
+#define WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_
 
 #include <list>
 
 #include "base/scoped_ptr.h"
 #include "base/task.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPlugin.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebViewClient.h"
 
 namespace WebKit {
 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.
 // To show HTML data inside the WebViewPlugin,
 // call web_view->mainFrame()->loadHTMLString() with the HTML data and a fake
 // chrome:// URL as origin.
 
 class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient,
                      public WebKit::WebFrameClient {
  public:
@@ skipping 97 matching lines @@
   WebKit::WebView* web_view_;
   gfx::Rect rect_;
 
   WebKit::WebURLResponse response_;
   std::list<std::string> data_;
   bool finished_loading_;
   scoped_ptr<WebKit::WebURLError> error_;
   WebKit::WebString old_title_;
 };
 
-#endif  // WEBKIT_GLUE_PLUGINS_WEBVIEW_PLUGIN_H_
+}  // namespace npapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_NPAPI_WEBVIEW_PLUGIN_H_