webkit/support/platform_support_mac.mm - Issue 5998002: Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/support/platform_support_mac.mm

Issue 5998002: Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years 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: webkit/support/platform_support_mac.mm

diff --git a/webkit/support/platform_support_mac.mm b/webkit/support/platform_support_mac.mm

index 8ff15a7c26946d1ed71513edab881ec1fb40948d..7aeb80b94449be8512442a29724db0292514da46 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/plugins/npapi/plugin_list.h"

+#include "webkit/glue/plugins/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");

- webkit::npapi::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);

+ NPAPI::PluginList::Singleton()->AddExtraPluginDir(plugins_dir);

}

void BeforeShutdown() {

« no previous file with comments | « webkit/plugins/plugin_switches.cc ('k') | webkit/support/test_webplugin_page_delegate.h » ('j') | no next file with comments »