Remove webkit/plugins/npapi.

content/browser/renderer_host/render_widget_host_impl.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_impl.h"
 
 #include <math.h>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 42 matching lines @@
 #include "skia/ext/image_operations.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "ui/base/events/event.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/size_conversions.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/gfx/vector2d_conversions.h"
 #include "webkit/common/cursors/webcursor.h"
 #include "webkit/common/webpreferences.h"
-#include "webkit/plugins/npapi/plugin_utils.h"
 
 #if defined(TOOLKIT_GTK)
 #include "content/browser/renderer_host/backing_store_gtk.h"
 #elif defined(OS_MACOSX)
 #include "content/browser/renderer_host/backing_store_mac.h"
+#elif defined(OS_WIN)
+#include "content/common/plugin_constants_win.h"
 #endif
 
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
 using WebKit::WebGestureEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebMouseEvent;
 using WebKit::WebMouseWheelEvent;
@@ skipping 2145 matching lines @@
 
   zoomed_bitmap.setPixels(0);
   Send(new ViewMsg_ReleaseDisambiguationPopupDIB(GetRoutingID(),
                                                  dib->handle()));
 }
 
 #if defined(OS_WIN)
 void RenderWidgetHostImpl::OnWindowlessPluginDummyWindowCreated(
     gfx::NativeViewId dummy_activation_window) {
   HWND hwnd = reinterpret_cast<HWND>(dummy_activation_window);
-  if (!IsWindow(hwnd) || !webkit::npapi::IsDummyActivationWindow(hwnd)) {
-    // This may happen as a result of a race condition when the plugin is going
-    // away.
+
+  // This may happen as a result of a race condition when the plugin is going
+  // away.
+  wchar_t window_title[MAX_PATH + 1] = {0};
+  if (!IsWindow(hwnd) ||
+      !GetWindowText(hwnd, window_title, arraysize(window_title)) ||
+      lstrcmpiW(window_title, kDummyActivationWindowName) != 0) {
     return;
   }
 
   SetParent(hwnd, reinterpret_cast<HWND>(GetNativeViewId()));
   dummy_windows_for_activation_.push_back(hwnd);
 }
 
 void RenderWidgetHostImpl::OnWindowlessPluginDummyWindowDestroyed(
     gfx::NativeViewId dummy_activation_window) {
   HWND hwnd = reinterpret_cast<HWND>(dummy_activation_window);
@@ skipping 343 matching lines @@
   if (!is_threaded_compositing_enabled_)
     Send(new ViewMsg_SwapBuffers_ACK(routing_id_));
 }
 
 #if defined(USE_AURA)
 
 void RenderWidgetHostImpl::ParentChanged(gfx::NativeViewId new_parent) {
 #if defined(OS_WIN)
   HWND hwnd = reinterpret_cast<HWND>(new_parent);
   if (!hwnd)
-    hwnd = webkit::npapi::GetDefaultWindowParent();
+    hwnd = GetDesktopWindow();
   for (std::list<HWND>::iterator i = dummy_windows_for_activation_.begin();
         i != dummy_windows_for_activation_.end(); ++i) {
     SetParent(*i, hwnd);
   }
 #endif
 }
 
 #endif
 
 void RenderWidgetHostImpl::DelayedAutoResized() {
@@ skipping 118 matching lines @@
     int process_id = (b->first.second >> 32) & 0xffffffff;
     RenderWidgetHost* rwh =
         RenderWidgetHost::FromID(process_id, routing_id);
     if (!rwh)
       continue;
     RenderWidgetHostImpl::From(rwh)->FrameSwapped(latency_info);
   }
 }
 
 }  // namespace content