Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/renderer/pepper_widget.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/pepper_widget.h"
 
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "chrome/renderer/pepper_scrollbar_widget.h"
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 #include "skia/ext/platform_canvas.h"
-#include "webkit/glue/plugins/plugin_instance.h"
-#include "webkit/glue/plugins/webplugin.h"
-#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/plugins/npapi/webplugin_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 static int g_next_id;
 typedef base::hash_map<int, PepperWidget*> WidgetMap;
 static base::LazyInstance<WidgetMap> g_widgets(base::LINKER_INITIALIZED);
 
 NPError NPCreateWidget(NPP instance,
@@ skipping 25 matching lines @@
 }
 
 NPError NPPaintWidget(NPP instance,
                       NPWidgetID id,
                       NPDeviceContext2D* context,
                       NPRect* dirty) {
   WidgetMap::iterator iter = g_widgets.Get().find(id);
   if (iter == g_widgets.Get().end())
     return NPERR_INVALID_PARAM;
 
-  NPAPI::PluginInstance* plugin =
-      static_cast<NPAPI::PluginInstance*>(instance->ndata);
+  webkit::npapi::PluginInstance* plugin =
+      static_cast<webkit::npapi::PluginInstance*>(instance->ndata);
   WebPluginDelegatePepper* delegate =
       static_cast<WebPluginDelegatePepper*>(plugin->webplugin()->delegate());
   Graphics2DDeviceContext* gdc = delegate->GetGraphicsContext(context);
   iter->second->Paint(gdc, *dirty);
 
 #if defined(OS_WIN)
   if (base::win::GetVersion() == base::win::VERSION_XP) {
     gdc->canvas()->getTopPlatformDevice().makeOpaque(
         dirty->left, dirty->top, dirty->right - dirty->left,
         dirty->bottom - dirty->top);
@@ skipping 56 matching lines @@
     g_widgets.Get().erase(id_);
 }
 
 void PepperWidget::Init(NPP instance, int id) {
   instance_ = instance;
   id_ = id;
   g_widgets.Get()[id] = this;
 }
 
 void PepperWidget::WidgetPropertyChanged(NPWidgetProperty property) {
-  NPAPI::PluginInstance* instance =
-      static_cast<NPAPI::PluginInstance*>(instance_->ndata);
+  webkit::npapi::PluginInstance* instance =
+      static_cast<webkit::npapi::PluginInstance*>(instance_->ndata);
   NPPExtensions* extensions = NULL;
   instance->NPP_GetValue(NPPVPepperExtensions, &extensions);
   if (!extensions)
     return;
 
   extensions->widgetPropertyChanged(instance_, id_, property);
 }