Remove webkit/plugins/npapi.

content/browser/renderer_host/render_widget_host_view_base.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 
 #include "base/logging.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/renderer_host/basic_mouse_wheel_smooth_scroll_gesture.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/port/browser/render_widget_host_view_frame_subscriber.h"
 #include "content/port/browser/smooth_scroll_gesture.h"
 #include "third_party/WebKit/public/web/WebScreenInfo.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/size_f.h"
 
 #if defined(OS_WIN)
 #include "base/command_line.h"
 #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"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/common/content_switches.h"
 #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)
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 
 #include "content/browser/renderer_host/gtk_window_utils.h"
 #endif
 
 namespace content {
@@ skipping 113 matching lines @@
   static const int kMaxTries = 5;
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&NotifyPluginProcessHostHelper, window, new_parent,
                  kMaxTries));
   return new_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);
   gfx::Rect rect_in_pixels = ui::win::DIPToScreenRect(*rect);
   static UINT msg = RegisterWindowMessage(kPaintMessageName);
   WPARAM wparam = rect_in_pixels.x() << 16 | rect_in_pixels.y();
   lparam = rect_in_pixels.width() << 16 | rect_in_pixels.height();
 
   // SendMessage gets the message across much quicker than PostMessage, since it
   // doesn't get queued.  When the plugin thread calls PeekMessage or other
   // Win32 APIs, sent messages are dispatched automatically.
   SendNotifyMessage(hwnd, msg, wparam, lparam);
 
   return TRUE;
 }
 
 // Windows callback for OnDestroy to detach the plugin windows.
 BOOL CALLBACK DetachPluginWindowsCallbackInternal(HWND window, LPARAM param) {
   RenderWidgetHostViewBase::DetachPluginWindowsCallback(window);
   return TRUE;
 }
 
 }  // namespace
 
 // 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);
   }
 }
 
 // static
 void RenderWidgetHostViewBase::MovePluginWindowsHelper(
     HWND parent,
     const std::vector<WebPluginGeometry>& moves) {
@@ skipping 20 matching lines @@
     // As the plugin parent window which lives on the browser UI thread is
     // destroyed asynchronously, it is possible that we have a stale window
     // sent in by the renderer for moving around.
     // Note: get the parent before checking if the window is valid, to avoid a
     // race condition where the window is destroyed after the check but before
     // the GetParent call.
     HWND cur_parent = ::GetParent(window);
     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.
       continue;
     }
 
     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
         // PluginProcessHost to destroy the intermediate HWNDs.
         cur_parent = ReparentWindow(window, parent);
         ::ShowWindow(window, SW_SHOW);  // Window was created hidden.
       } else if (!IsPluginWrapperWindow(cur_parent)) {
         continue;  // Race if plugin process is shutting down.
       }
 
       // We move the intermediate parent window which doesn't result in cross-
       // process synchronous Windows messages.
       window = cur_parent;
     } else {
-      if (cur_parent == webkit::npapi::GetDefaultWindowParent())
+      if (cur_parent == GetDesktopWindow())
         SetParent(window, parent);
     }
 
     if (move.visible)
       flags |= SWP_SHOWWINDOW;
     else
       flags |= SWP_HIDEWINDOW;
 
 #if defined(USE_AURA)
     // Without this flag, Windows repaints the parent area uncovered by this
@@ skipping 253 matching lines @@
 
 uint32 RenderWidgetHostViewBase::RendererFrameNumber() {
   return renderer_frame_number_;
 }
 
 void RenderWidgetHostViewBase::DidReceiveRendererFrame() {
   ++renderer_frame_number_;
 }
 
 }  // namespace content