diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
| commit | c85b0ba71b5a55647b01de9d345e46896979033d (patch) | |
| tree | ae99657ca1440b7540da473e1bbe6156e43e9be3 /chrome/plugin/npobject_stub.cc | |
| parent | 887ba3adc7b32b7df315ef292ae9395fd75653e5 (diff) | |
| download | chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.zip chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.gz chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.bz2 | |
Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69755, which broke the tree.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5998002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/plugin/npobject_stub.cc')
| -rw-r--r-- | chrome/plugin/npobject_stub.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/plugin/npobject_stub.cc b/chrome/plugin/npobject_stub.cc index e0a8436..c711756 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/plugins/npapi/plugin_constants_win.h" +#include "webkit/glue/plugins/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 == webkit::npapi::kNewWMPPlugin && id == fullscreen) { + if (filename == 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); |