chrome/plugin/npobject_proxy.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_proxy.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_proxy.cc

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

index f245151b62c2029903211b3ec8317de903a48487..0b7ff45911cc3042c73af00e3d380a922838a8eb 100644

--- a/chrome/plugin/npobject_proxy.cc

+++ b/chrome/plugin/npobject_proxy.cc

@@ -9,7 +9,7 @@

#include "chrome/plugin/plugin_channel.h"

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

#include "webkit/glue/webkit_glue.h"

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

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

using WebKit::WebBindings;

@@ -460,8 +460,8 @@ bool NPObjectProxy::NPNEvaluate(NPP npp,

bool popups_allowed = false;

if (npp) {

- NPAPI::PluginInstance* plugin_instance =

- reinterpret_cast<NPAPI::PluginInstance*>(npp->ndata);

+ webkit::npapi::PluginInstance* plugin_instance =

+ reinterpret_cast<webkit::npapi::PluginInstance*>(npp->ndata);

if (plugin_instance)

popups_allowed = plugin_instance->popups_allowed();

}

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