chrome/plugin/npobject_util.cc - Issue 5996003: Revert "Revert 69755 - 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: chrome/plugin/npobject_util.cc

Issue 5996003: Revert "Revert 69755 - 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: chrome/plugin/npobject_util.cc

diff --git a/chrome/plugin/npobject_util.cc b/chrome/plugin/npobject_util.cc

index 0c54a3308bae64459fd04b104bc29ddd03ab7055..60324cf2fda26024fc5fef56c57d67db850eaedb 100644

--- a/chrome/plugin/npobject_util.cc

+++ b/chrome/plugin/npobject_util.cc

@@ -10,7 +10,7 @@

#include "chrome/plugin/plugin_channel_base.h"

#include "third_party/npapi/bindings/nphostapi.h"

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

-#include "webkit/glue/plugins/plugin_host.h"

+#include "webkit/plugins/npapi/plugin_host.h"

#include "webkit/glue/webkit_glue.h"

using WebKit::WebBindings;

@@ -129,7 +129,7 @@ NPNetscapeFuncs *GetHostFunctions() {

void PatchNPNFunctions() {

g_plugin_process = true;

NPNetscapeFuncs* funcs = GetHostFunctions();

- NPAPI::PluginHost::Singleton()->PatchNPNetscapeFuncs(funcs);

+ webkit::npapi::PluginHost::Singleton()->PatchNPNetscapeFuncs(funcs);

}

bool IsPluginProcess() {

« no previous file with comments | « chrome/plugin/npobject_stub.cc ('k') | chrome/plugin/plugin_channel.cc » ('j') | no next file with comments »