Index: content/common/plugin_list_posix.cc |
=================================================================== |
--- content/common/plugin_list_posix.cc (revision 212369) |
+++ content/common/plugin_list_posix.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/plugins/npapi/plugin_list.h" |
+#include "content/common/plugin_list.h" |
#include <algorithm> |
#include <dlfcn.h> |
@@ -35,9 +35,11 @@ |
// happy. |
#include "base/third_party/nspr/prcpucfg_linux.h" |
-namespace webkit { |
-namespace npapi { |
+using webkit::WebPluginInfo; |
+using webkit::WebPluginMimeType; |
+namespace content { |
+ |
namespace { |
// We build up a list of files and mtimes so we can sort them. |
@@ -591,5 +593,4 @@ |
return true; |
} |
-} // namespace npapi |
-} // namespace webkit |
+} // namespace content |