Index: webkit/plugins/npapi/plugin_list.cc |
=================================================================== |
--- webkit/plugins/npapi/plugin_list.cc (revision 0) |
+++ webkit/plugins/npapi/plugin_list.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "webkit/glue/plugins/plugin_list.h" |
+#include "webkit/plugins/npapi/plugin_list.h" |
#include <algorithm> |
@@ -15,9 +15,9 @@ |
#include "base/utf_string_conversions.h" |
#include "googleurl/src/gurl.h" |
#include "net/base/mime_util.h" |
-#include "webkit/glue/plugins/plugin_constants_win.h" |
-#include "webkit/glue/plugins/plugin_lib.h" |
#include "webkit/glue/webkit_glue.h" |
+#include "webkit/plugins/npapi/plugin_constants_win.h" |
+#include "webkit/plugins/npapi/plugin_lib.h" |
#include "webkit/plugins/plugin_switches.h" |
#if defined(OS_POSIX) |
@@ -25,8 +25,12 @@ |
#include "base/third_party/valgrind/valgrind.h" |
#endif // defined(OS_POSIX) |
-namespace NPAPI { |
+namespace webkit { |
+namespace npapi { |
+FilePath::CharType kDefaultPluginLibraryName[] = |
+ FILE_PATH_LITERAL("default_plugin"); |
+ |
#if defined(OS_MACOSX) |
// Plugin Groups for Mac. |
// Plugins are listed here as soon as vulnerabilities and solutions |
@@ -777,4 +781,5 @@ |
#endif |
} |
-} // namespace NPAPI |
+} // namespace npapi |
+} // namespace webkit |