Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/plugin_constants_win.h

Index: webkit/plugins/npapi/plugin_constants_win.h
===================================================================
--- webkit/plugins/npapi/plugin_constants_win.h	(revision 0)
+++ webkit/plugins/npapi/plugin_constants_win.h	(working copy)
@@ -2,40 +2,44 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGIN_CONSTANTS_WIN_H_
-#define WEBKIT_GLUE_PLUGIN_CONSTANTS_WIN_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_CONSTANTS_WIN_H_
+#define WEBKIT_PLUGINS_NPAPI_PLUGIN_CONSTANTS_WIN_H_
 
-// Used by the plugins_test when testing the older WMP plugin to force the new
-// plugin to not get loaded.
-#define kUseOldWMPPluginSwitch "use-old-wmp"
+#include "base/string16.h"
 
+namespace webkit {
+namespace npapi {
+
 // The window class name for a plugin window.
-#define kNativeWindowClassName L"NativeWindowClass"
+extern const char16 kNativeWindowClassName[];
 
 // The name of the window class name for the wrapper HWND around the actual
 // plugin window that's used when running in multi-process mode.  This window
 // is created on the browser UI thread.
-#define kWrapperNativeWindowClassName L"WrapperNativeWindowClass"
+extern const char16 kWrapperNativeWindowClassName[];
 
 // The name of the custom window message that the browser uses to tell the
 // plugin process to paint a window.
-#define kPaintMessageName L"Chrome_CustomPaint"
+extern const char16 kPaintMessageName[];
 
 // The name of the registry key which NPAPI plugins update on installation.
-#define kRegistryMozillaPlugins L"SOFTWARE\\MozillaPlugins"
+extern const char16 kRegistryMozillaPlugins[];
 
-#define kMozillaActiveXPlugin L"npmozax.dll"
-#define kNewWMPPlugin L"np-mswmp.dll"
-#define kOldWMPPlugin L"npdsplay.dll"
-#define kYahooApplicationStatePlugin L"npystate.dll"
-#define kWanWangProtocolHandlerPlugin L"npww.dll"
-#define kFlashPlugin L"npswf32.dll"
-#define kAcrobatReaderPlugin L"nppdf32.dll"
-#define kRealPlayerPlugin L"nppl3260.dll"
-#define kSilverlightPlugin L"npctrl.dll"
-#define kJavaPlugin1 L"npjp2.dll"
-#define kJavaPlugin2 L"npdeploytk.dll"
+extern const char16 kMozillaActiveXPlugin[];
+extern const char16 kNewWMPPlugin[];
+extern const char16 kOldWMPPlugin[];
+extern const char16 kYahooApplicationStatePlugin[];
+extern const char16 kWanWangProtocolHandlerPlugin[];
+extern const char16 kFlashPlugin[];
+extern const char16 kAcrobatReaderPlugin[];
+extern const char16 kRealPlayerPlugin[];
+extern const char16 kSilverlightPlugin[];
+extern const char16 kJavaPlugin1[];
+extern const char16 kJavaPlugin2[];
 
-#define kGPUPluginMimeType "application/vnd.google.chrome.gpu-plugin"
+extern const char16 kGPUPluginMimeType[];
 
-#endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H_
+}  // namespace npapi
+}  // namespace webkit
+
+#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_PLUGIN_LIST_H_