Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/child/npapi/webplugin_delegate_impl.h

Index: content/child/npapi/webplugin_delegate_impl.h
===================================================================
--- content/child/npapi/webplugin_delegate_impl.h	(revision 0)
+++ content/child/npapi/webplugin_delegate_impl.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_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
+#ifndef CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
+#define CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
 
 #include <string>
 #include <vector>
@@ -14,12 +14,11 @@
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/timer/timer.h"
 #include "build/build_config.h"
+#include "content/child/npapi/webplugin_delegate.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
 #include "webkit/common/cursors/webcursor.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
-#include "webkit/plugins/webkit_plugins_export.h"
 
 #if defined(USE_X11)
 #include "ui/base/x/x11_util.h"
@@ -41,8 +40,7 @@
 #endif
 #endif
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 class PluginInstance;
 
@@ -57,7 +55,7 @@
 
 // An implementation of WebPluginDelegate that runs in the plugin process,
 // proxied from the renderer by WebPluginDelegateProxy.
-class WEBKIT_PLUGINS_EXPORT WebPluginDelegateImpl : public WebPluginDelegate {
+class WebPluginDelegateImpl : public WebPluginDelegate {
  public:
   enum PluginQuirks {
     PLUGIN_QUIRK_SETWINDOW_TWICE = 1,  // Win32
@@ -82,22 +80,6 @@
   static WebPluginDelegateImpl* Create(const base::FilePath& filename,
                                        const std::string& mime_type);
 
-#if defined(OS_WIN)
-  static bool IsPluginDelegateWindow(HWND window);
-  static bool GetPluginNameFromWindow(HWND window,
-                                      base::string16* plugin_name);
-  static bool GetPluginVersionFromWindow(HWND window,
-                                         base::string16* plugin_version);
-
-  // Returns true if the window handle passed in is that of the dummy
-  // activation window for windowless plugins.
-  static bool IsDummyActivationWindow(HWND window);
-
-  // Returns the default HWND to parent the windowed plugins and dummy windows
-  // for activation to when none isavailable.
-  static HWND GetDefaultWindowParent();
-#endif
-
   // WebPluginDelegate implementation
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
@@ -501,7 +483,6 @@
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegateImpl);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_
+#endif  // CONTENT_CHILD_NPAPI_WEBPLUGIN_DELEGATE_IMPL_H_