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/renderer/pepper_widget.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/renderer/pepper_widget.cc')
| -rw-r--r-- | chrome/renderer/pepper_widget.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/renderer/pepper_widget.cc b/chrome/renderer/pepper_widget.cc index 176510f..ba37f87 100644 --- a/chrome/renderer/pepper_widget.cc +++ b/chrome/renderer/pepper_widget.cc @@ -9,9 +9,9 @@ #include "chrome/renderer/pepper_scrollbar_widget.h" #include "chrome/renderer/webplugin_delegate_pepper.h" #include "skia/ext/platform_canvas.h" -#include "webkit/plugins/npapi/plugin_instance.h" -#include "webkit/plugins/npapi/webplugin.h" -#include "webkit/plugins/npapi/webplugin_delegate.h" +#include "webkit/glue/plugins/plugin_instance.h" +#include "webkit/glue/plugins/webplugin.h" +#include "webkit/glue/plugins/webplugin_delegate.h" #if defined(OS_WIN) #include "base/win/windows_version.h" @@ -57,8 +57,8 @@ NPError NPPaintWidget(NPP instance, if (iter == g_widgets.Get().end()) return NPERR_INVALID_PARAM; - webkit::npapi::PluginInstance* plugin = - static_cast<webkit::npapi::PluginInstance*>(instance->ndata); + NPAPI::PluginInstance* plugin = + static_cast<NPAPI::PluginInstance*>(instance->ndata); WebPluginDelegatePepper* delegate = static_cast<WebPluginDelegatePepper*>(plugin->webplugin()->delegate()); Graphics2DDeviceContext* gdc = delegate->GetGraphicsContext(context); @@ -135,8 +135,8 @@ void PepperWidget::Init(NPP instance, int id) { } void PepperWidget::WidgetPropertyChanged(NPWidgetProperty property) { - webkit::npapi::PluginInstance* instance = - static_cast<webkit::npapi::PluginInstance*>(instance_->ndata); + NPAPI::PluginInstance* instance = + static_cast<NPAPI::PluginInstance*>(instance_->ndata); NPPExtensions* extensions = NULL; instance->NPP_GetValue(NPPVPepperExtensions, &extensions); if (!extensions) |