Clean up plug-in placeholders:

* Add separate class for missing plug-in placeholder, and factor out a common base class
* Move plug-in related classes to plugins/ subdirectory
* Move custom menu command IDs to a separate header file.

TBR=darin@chromium.org
BUG=62079
TEST=none

Review URL: http://codereview.chromium.org/8461011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111589 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 11 deletions

diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index dfab5fb..7cc1a45 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -190,8 +190,6 @@
         '../plugins/npapi/webplugin_ime_win.h',
         '../plugins/npapi/webplugin_impl.cc',
         '../plugins/npapi/webplugin_impl.h',
-        '../plugins/npapi/webview_plugin.cc',
-        '../plugins/npapi/webview_plugin.h',
         '../plugins/plugin_constants.cc',
         '../plugins/plugin_constants.h',
         '../plugins/plugin_switches.cc',
@@ -325,6 +323,8 @@
         '../plugins/sad_plugin.h',
         '../plugins/webplugininfo.cc',
         '../plugins/webplugininfo.h',
+        '../plugins/webview_plugin.cc',
+        '../plugins/webview_plugin.h',
         'alt_error_page_resource_fetcher.cc',
         'alt_error_page_resource_fetcher.h',
         'context_menu.cc',
diff --git a/webkit/plugins/npapi/webview_plugin.cc b/webkit/plugins/webview_plugin.cc
index cda369b..f43fc2c 100644
--- a/webkit/plugins/npapi/webview_plugin.cc
+++ b/webkit/plugins/webview_plugin.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/webview_plugin.h"
+#include "webkit/plugins/webview_plugin.h"
 
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
@@ -45,7 +45,6 @@ using WebKit::WebVector;
 using WebKit::WebView;
 
 namespace webkit {
-namespace npapi {
 
 WebViewPlugin::WebViewPlugin(WebViewPlugin::Delegate* delegate)
     : delegate_(delegate),
@@ -250,5 +249,4 @@ void WebViewPlugin::didReceiveResponse(WebFrame* frame,
   WebFrameClient::didReceiveResponse(frame, identifier, response);
 }
 
-}  // namespace npapi
 }  // namespace webkit
diff --git a/webkit/plugins/npapi/webview_plugin.h b/webkit/plugins/webview_plugin.h
index c03c8a5..1d2a35d 100644
--- a/webkit/plugins/npapi/webview_plugin.h
+++ b/webkit/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_PLUGINS_WEBVIEW_PLUGIN_H_
+#define WEBKIT_PLUGINS_WEBVIEW_PLUGIN_H_
 
 #include <list>
 
@@ -13,7 +13,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrameClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPlugin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebViewClient.h"
 
@@ -23,7 +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.
@@ -141,8 +139,11 @@ class WebViewPlugin: public WebKit::WebPlugin, public WebKit::WebViewClient,
   virtual ~WebViewPlugin();
 
   Delegate* delegate_;
+  // Destroys itself.
   WebKit::WebCursorInfo current_cursor_;
+  // Owns us.
   WebKit::WebPluginContainer* container_;
+  // Owned by us, deleted via |close()|.
   WebKit::WebView* web_view_;
   gfx::Rect rect_;
 
@@ -153,7 +154,6 @@ 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_PLUGINS_WEBVIEW_PLUGIN_H_