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

chrome/renderer/blocked_plugin.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/blocked_plugin.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_piece.h"
 #include "base/values.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/render_view.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebContextMenuData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebMenuItemInfo.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPoint.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
-#include "webkit/glue/plugins/plugin_group.h"
-#include "webkit/glue/plugins/webview_plugin.h"
 #include "webkit/glue/webpreferences.h"
+#include "webkit/plugins/npapi/plugin_group.h"
+#include "webkit/plugins/npapi/webview_plugin.h"
 
 using WebKit::WebContextMenuData;
 using WebKit::WebFrame;
 using WebKit::WebMenuItemInfo;
 using WebKit::WebPlugin;
 using WebKit::WebPluginContainer;
 using WebKit::WebPluginParams;
 using WebKit::WebPoint;
 using WebKit::WebString;
 using WebKit::WebVector;
 
 static const char* const kBlockedPluginDataURL = "chrome://blockedplugindata/";
 static const unsigned kMenuActionLoad = 1;
 static const unsigned kMenuActionRemove = 2;
 
 BlockedPlugin::BlockedPlugin(RenderView* render_view,
                              WebFrame* frame,
-                             const PluginGroup& info,
+                             const webkit::npapi::PluginGroup& info,
                              const WebPluginParams& params,
                              const WebPreferences& preferences,
                              int template_id,
                              const string16& message)
     : render_view_(render_view),
       frame_(frame),
       plugin_params_(params) {
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(template_id));
 
   DCHECK(!template_html.empty()) << "unable to load template. ID: "
                                  << template_id;
 
   DictionaryValue values;
   values.SetString("message", message);
   name_ = info.GetGroupName();
   values.SetString("name", name_);
 
   // "t" is the id of the templates root node.
   std::string html_data = jstemplate_builder::GetTemplatesHtml(
       template_html, &values, "t");
 
-  plugin_ = WebViewPlugin::Create(this,
-                                  preferences,
-                                  html_data,
-                                  GURL(kBlockedPluginDataURL));
+  plugin_ = webkit::npapi::WebViewPlugin::Create(this,
+                                                 preferences,
+                                                 html_data,
+                                                 GURL(kBlockedPluginDataURL));
 
   registrar_.Add(this,
                  NotificationType::SHOULD_LOAD_PLUGINS,
                  NotificationService::AllSources());
 }
 
 BlockedPlugin::~BlockedPlugin() {
   render_view_->CustomMenuListenerDestroyed(this);
 }
 
@@ skipping 76 matching lines @@
     plugin_->destroy();
   }
 }
 
 void BlockedPlugin::HidePlugin() {
   CHECK(plugin_);
   WebPluginContainer* container = plugin_->container();
   container->element().setAttribute("style", "display: none;");
 }