summaryrefslogtreecommitdiffstats
path: root/webkit/support/platform_support_mac.mm
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:38:12 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-20 21:38:12 +0000
commitb692a128b073b297a4ce2aa7c468fdd37823e3a8 (patch)
tree3561224ba86e8eabd75f3e7a2f2343002d9a58ff /webkit/support/platform_support_mac.mm
parentb07c8d9a926a89d0aa7c0de2e1d2685b728a887e (diff)
downloadchromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.zip
chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.gz
chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.bz2
Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace. BUG=none TEST=none Review URL: http://codereview.chromium.org/6012002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/support/platform_support_mac.mm')
-rw-r--r--webkit/support/platform_support_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm
index 7aeb80b..8ff15a7 100644
--- a/webkit/support/platform_support_mac.mm
+++ b/webkit/support/platform_support_mac.mm
@@ -17,7 +17,7 @@
#include "base/string16.h"
#include "grit/webkit_resources.h"
#include "third_party/WebKit/WebKit/mac/WebCoreSupport/WebSystemInterface.h"
-#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/plugins/npapi/plugin_list.h"
#import "webkit/support/drt_application_mac.h"
#import "webkit/tools/test_shell/mac/DumpRenderTreePasteboard.h"
@@ -148,7 +148,7 @@ void AfterInitialize(bool unit_test_mode) {
FilePath plugins_dir;
PathService::Get(base::DIR_EXE, &plugins_dir);
plugins_dir = plugins_dir.AppendASCII("../../../plugins");
- NPAPI::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
+ webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);
}
void BeforeShutdown() {