Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Unified Diff: content/common/plugin_list_posix.cc

Issue 19761007: Move NPAPI implementation out of webkit/plugins/npapi and into content. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698