Remove webkit/plugins/npapi.

-NPAPIPluginsSupported moves to PluginService
  -no need to call it in PluginList methods anymore since PluginService is now the only place that calls these methods, and it can check first
  -no need for the renderer to call this first since now the browser won't enumerate NPAPI plugins if it's disabled
-CreateVersionFromString moves to WebPluginInfo. I couldn't find a better place to put it.
-move the constants back to plugin_constants_win.h
-move PLUGIN_QUIRK_DIE_AFTER_UNLOAD handling to WebPluginDelegateStub and PluginThread instead of being a global
-GetDefaultWindowParent moves to plugin_constants_win.h. I couldn't find a better place.
-IsPluginWindow moves to PluginService
-GetPluginNameFromWindow and GetPluginVersionFromWindow are both replaced by GetPluginInfoFromWindow which is on PluginService
-IsDummyActivationWindow was called by one place so I moved the code there

BUG=237249
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/19844003

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

1 files changed, 6 insertions, 6 deletions

diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index 3a1121b..8783ee9 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -22,6 +22,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/win/wrapped_window_proc.h"
 #include "content/browser/plugin_process_host.h"
+#include "content/browser/plugin_service_impl.h"
 #include "content/common/plugin_constants_win.h"
 #include "content/common/webplugin_geometry.h"
 #include "content/public/browser/browser_thread.h"
@@ -30,7 +31,6 @@
 #include "ui/base/win/dpi.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/gdi_util.h"
-#include "webkit/plugins/npapi/plugin_utils.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
@@ -164,7 +164,7 @@ HWND ReparentWindow(HWND window, HWND parent) {
 }
 
 BOOL CALLBACK PaintEnumChildProc(HWND hwnd, LPARAM lparam) {
-  if (!webkit::npapi::IsPluginDelegateWindow(hwnd))
+  if (!PluginServiceImpl::GetInstance()->IsPluginWindow(hwnd))
     return TRUE;
 
   gfx::Rect* rect = reinterpret_cast<gfx::Rect*>(lparam);
@@ -191,7 +191,7 @@ BOOL CALLBACK DetachPluginWindowsCallbackInternal(HWND window, LPARAM param) {
 
 // static
 void RenderWidgetHostViewBase::DetachPluginWindowsCallback(HWND window) {
-  if (webkit::npapi::IsPluginDelegateWindow(window) &&
+  if (PluginServiceImpl::GetInstance()->IsPluginWindow(window) &&
       !IsHungAppWindow(window)) {
     ::ShowWindow(window, SW_HIDE);
     SetParent(window, NULL);
@@ -232,7 +232,7 @@ void RenderWidgetHostViewBase::MovePluginWindowsHelper(
     if (!::IsWindow(window))
       continue;
 
-    if (!webkit::npapi::IsPluginDelegateWindow(window)) {
+    if (!PluginServiceImpl::GetInstance()->IsPluginWindow(window)) {
       // The renderer should only be trying to move plugin windows. However,
       // this may happen as a result of a race condition (i.e. even after the
       // check right above), so we ignore it.
@@ -240,7 +240,7 @@ void RenderWidgetHostViewBase::MovePluginWindowsHelper(
     }
 
     if (oop_plugins) {
-      if (cur_parent == webkit::npapi::GetDefaultWindowParent()) {
+      if (cur_parent == GetDesktopWindow()) {
         // The plugin window hasn't been parented yet, add an intermediate
         // window that lives on this thread to speed up scrolling. Note this
         // only works with out of process plugins since we depend on
@@ -255,7 +255,7 @@ void RenderWidgetHostViewBase::MovePluginWindowsHelper(
       // process synchronous Windows messages.
       window = cur_parent;
     } else {
-      if (cur_parent == webkit::npapi::GetDefaultWindowParent())
+      if (cur_parent == GetDesktopWindow())
         SetParent(window, parent);
     }