chrome/plugin/npobject_stub.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_stub.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_stub.cc

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

index c7117561ababeb2bdb04ec20404ccfc5436efc07..e0a8436d790a3076f29bb94f924bdaaf8f577a32 100644

--- a/chrome/plugin/npobject_stub.cc

+++ b/chrome/plugin/npobject_stub.cc

@@ -12,7 +12,7 @@

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

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

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

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

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

using WebKit::WebBindings;

@@ -243,7 +243,7 @@ void NPObjectStub::OnSetProperty(const NPIdentifier_Param& name,

PluginThread::current()->plugin_path().BaseName().value());

static NPIdentifier fullscreen =

WebBindings::getStringIdentifier("fullScreen");

- if (filename == kNewWMPPlugin && id == fullscreen) {

+ if (filename == webkit::npapi::kNewWMPPlugin && id == fullscreen) {

// Workaround for bug 15985, which is if Flash causes WMP to go

// full screen a deadlock can occur when WMP calls SetFocus.

NPObjectMsg_SetProperty::WriteReplyParams(reply_msg, true);

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