Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

webkit/glue/plugins/webplugin_delegate_impl_win.cc

 // Copyright (c) 2010 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 "webkit/plugins/npapi/webplugin_delegate_impl.h"
+#include "webkit/glue/plugins/webplugin_delegate_impl.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "app/win/iat_patch_function.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/scoped_ptr.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "skia/ext/platform_canvas.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h"
+#include "webkit/glue/plugins/default_plugin_shared.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_lib.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/plugin_stream_url.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/default_plugin_shared.h"
-#include "webkit/plugins/npapi/plugin_constants_win.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/plugin_stream_url.h"
-#include "webkit/plugins/npapi/webplugin.h"
 
 using WebKit::WebCursorInfo;
 using WebKit::WebKeyboardEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebMouseEvent;
 
-namespace webkit {
-namespace npapi {
-
 namespace {
 
 const wchar_t kWebPluginDelegateProperty[] = L"WebPluginDelegateProperty";
 const wchar_t kPluginNameAtomProperty[] = L"PluginNameAtom";
 const wchar_t kDummyActivationWindowName[] = L"DummyWindowForActivation";
 const wchar_t kPluginFlashThrottle[] = L"FlashThrottle";
 
 // The fastest we are willing to process WM_USER+1 events for Flash.
 // Flash can easily exceed the limits of our CPU if we don't throttle it.
 // The throttle has been chosen by testing various delays and compromising
@@ skipping 125 matching lines @@
     return L"";
 
   KEY_NAME_INFORMATION* info =
       reinterpret_cast<KEY_NAME_INFORMATION*>(buffer.get());
   return std::wstring(info->Name, info->NameLength / sizeof(wchar_t));
 }
 
 }  // namespace
 
 bool WebPluginDelegateImpl::IsPluginDelegateWindow(HWND window) {
-  static const int kBufLen = 64;
-  wchar_t class_name[kBufLen];
-  if (!GetClassNameW(window, class_name, kBufLen))
+  // We use a buffer that is one char longer than we need to detect cases where
+  // kNativeWindowClassName is a prefix of the given window's class name.  It
+  // happens that GetClassNameW will just silently truncate the class name to
+  // fit into the given buffer.
+  wchar_t class_name[arraysize(kNativeWindowClassName) + 1];
+  if (!GetClassNameW(window, class_name, arraysize(class_name)))
     return false;
   return wcscmp(class_name, kNativeWindowClassName) == 0;
 }
 
 bool WebPluginDelegateImpl::GetPluginNameFromWindow(
     HWND window, std::wstring *plugin_name) {
   if (NULL == plugin_name) {
     return false;
   }
   if (!IsPluginDelegateWindow(window)) {
@@ skipping 39 matching lines @@
     MOUSEHOOKSTRUCT* hook_struct = reinterpret_cast<MOUSEHOOKSTRUCT*>(lParam);
     if (hook_struct)
       HandleCaptureForMessage(hook_struct->hwnd, wParam);
   }
 
   return CallNextHookEx(NULL, code, wParam, lParam);
 }
 
 WebPluginDelegateImpl::WebPluginDelegateImpl(
     gfx::PluginWindowHandle containing_view,
-    PluginInstance *instance)
+    NPAPI::PluginInstance *instance)
     : parent_(containing_view),
       instance_(instance),
       quirks_(0),
       plugin_(NULL),
       windowless_(false),
       windowed_handle_(NULL),
       windowed_did_set_window_(false),
       plugin_wnd_proc_(NULL),
       last_message_(0),
       is_calling_wndproc(false),
@@ skipping 260 matching lines @@
                      WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
     SetParent(windowed_handle_, parent_);
   }
 
   BOOL result = SetProp(windowed_handle_, kWebPluginDelegateProperty, this);
   DCHECK(result == TRUE) << "SetProp failed, last error = " << GetLastError();
   // Get the name of the plugin, create an atom and set that in a window
   // property. Use an atom so that other processes can access the name of
   // the plugin that this window is hosting
   if (instance_ != NULL) {
-    PluginLib* plugin_lib = instance()->plugin_lib();
+    NPAPI::PluginLib* plugin_lib = instance()->plugin_lib();
     if (plugin_lib != NULL) {
       std::wstring plugin_name = plugin_lib->plugin_info().name;
       if (!plugin_name.empty()) {
         ATOM plugin_name_atom = GlobalAddAtomW(plugin_name.c_str());
         DCHECK(0 != plugin_name_atom);
         result = SetProp(windowed_handle_,
             kPluginNameAtomProperty,
             reinterpret_cast<HANDLE>(plugin_name_atom));
         DCHECK(result == TRUE) << "SetProp failed, last error = " <<
             GetLastError();
@@ skipping 860 matching lines @@
     case WM_LBUTTONUP:
     case WM_MBUTTONUP:
     case WM_RBUTTONUP:
       ::ReleaseCapture();
       break;
 
     default:
       break;
   }
 }
-
-}  // namespace npapi
-}  // namespace webkit