Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7393)

Unified Diff: chrome/plugin/chrome_plugin_host.cc

Issue 5961004: Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin... (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
« no previous file with comments | « chrome/plugin/DEPS ('k') | chrome/plugin/npobject_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/plugin/chrome_plugin_host.cc
===================================================================
--- chrome/plugin/chrome_plugin_host.cc (revision 69765)
+++ chrome/plugin/chrome_plugin_host.cc (working copy)
@@ -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 @@
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());
« no previous file with comments | « chrome/plugin/DEPS ('k') | chrome/plugin/npobject_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698