webkit/tools/test_shell/test_shell_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/tools/test_shell/test_shell_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/tools/test_shell/test_shell_mac.mm

diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm

index 249ccba365c3882c36a4f3d2534fe6842963706a..3f9527649535c805740d16c28fae30892e71f16e 100644

--- a/webkit/tools/test_shell/test_shell_mac.mm

+++ b/webkit/tools/test_shell/test_shell_mac.mm

@@ -33,7 +33,7 @@

#include "third_party/WebKit/WebKit/chromium/public/WebView.h"

#include "webkit/glue/webkit_glue.h"

#include "webkit/glue/webpreferences.h"

-#include "webkit/plugins/npapi/plugin_list.h"

+#include "webkit/glue/plugins/plugin_list.h"

#include "webkit/tools/test_shell/mac/test_shell_webview.h"

#include "webkit/tools/test_shell/resource.h"

#include "webkit/tools/test_shell/simple_resource_loader_bridge.h"

@@ -252,7 +252,7 @@ void TestShell::InitializeTestShell(bool layout_test_mode,

} else {

plugins_dir = plugins_dir.AppendASCII("plugins");

}

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

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

}

NSButton* MakeTestButton(NSRect* rect, NSString* title, NSView* parent) {

« no previous file with comments | « webkit/tools/test_shell/test_shell.gypi ('k') | webkit/tools/test_shell/test_webview_delegate.h » ('j') | no next file with comments »