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/chrome_plugin_host.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/chrome_plugin_host.cc')
| -rw-r--r-- | chrome/plugin/chrome_plugin_host.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc index 8458e25..22b3da9 100644 --- a/chrome/plugin/chrome_plugin_host.cc +++ b/chrome/plugin/chrome_plugin_host.cc @@ -25,7 +25,7 @@ #include "net/base/upload_data.h" #include "net/http/http_response_headers.h" #include "webkit/appcache/appcache_interfaces.h" -#include "webkit/plugins/npapi/plugin_instance.h" +#include "webkit/glue/plugins/plugin_instance.h" #include "webkit/glue/resource_loader_bridge.h" #include "webkit/glue/resource_type.h" #include "webkit/glue/webkit_glue.h" @@ -415,8 +415,8 @@ CPBrowsingContext STDCALL CPB_GetBrowsingContextFromNPP(NPP npp) { if (!npp) return CPERR_INVALID_PARAMETER; - webkit::npapi::PluginInstance* instance = - static_cast<webkit::npapi::PluginInstance *>(npp->ndata); + NPAPI::PluginInstance* instance = + static_cast<NPAPI::PluginInstance *>(npp->ndata); WebPluginProxy* webplugin = static_cast<WebPluginProxy*>(instance->webplugin()); |