summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/plugins
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-21 04:29:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-21 04:29:20 +0000
commitd7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a (patch)
tree58b9de096179d94ab1fa05470340709e76cfdf49 /chrome/renderer/plugins
parentec7293192cc51edb8a89f084a165d384f5f82ab9 (diff)
downloadchromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.zip
chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.gz
chromium_src-d7bd3e5a343acc7a5a51dd51d44f19e3abbfd41a.tar.bz2
Move webplugininfo.h to content/public.
BUG=237249 TBR=scottmg Review URL: https://codereview.chromium.org/19894003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212812 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/plugins')
-rw-r--r--chrome/renderer/plugins/plugin_placeholder.cc3
-rw-r--r--chrome/renderer/plugins/plugin_placeholder.h8
2 files changed, 5 insertions, 6 deletions
diff --git a/chrome/renderer/plugins/plugin_placeholder.cc b/chrome/renderer/plugins/plugin_placeholder.cc
index 126f5ce..bcc4fb2 100644
--- a/chrome/renderer/plugins/plugin_placeholder.cc
+++ b/chrome/renderer/plugins/plugin_placeholder.cc
@@ -53,7 +53,6 @@ using WebKit::WebMouseEvent;
using WebKit::WebNode;
using WebKit::WebPlugin;
using WebKit::WebPluginContainer;
-using webkit::WebPluginInfo;
using WebKit::WebPluginParams;
using WebKit::WebPoint;
using WebKit::WebScriptSource;
@@ -150,7 +149,7 @@ PluginPlaceholder* PluginPlaceholder::CreateBlockedPlugin(
RenderView* render_view,
WebFrame* frame,
const WebPluginParams& params,
- const WebPluginInfo& plugin,
+ const content::WebPluginInfo& plugin,
const std::string& identifier,
const string16& name,
int template_id,
diff --git a/chrome/renderer/plugins/plugin_placeholder.h b/chrome/renderer/plugins/plugin_placeholder.h
index 1695475..7ec95bae 100644
--- a/chrome/renderer/plugins/plugin_placeholder.h
+++ b/chrome/renderer/plugins/plugin_placeholder.h
@@ -6,16 +6,16 @@
#define CHROME_RENDERER_PLUGINS_PLUGIN_PLACEHOLDER_H_
#include "chrome/renderer/plugins/webview_plugin.h"
+#include "content/public/common/webplugininfo.h"
#include "content/public/renderer/context_menu_client.h"
#include "content/public/renderer/render_process_observer.h"
#include "content/public/renderer/render_view_observer.h"
#include "third_party/WebKit/public/web/WebPluginParams.h"
-#include "webkit/plugins/webplugininfo.h"
#include "webkit/renderer/cpp_bound_class.h"
struct ChromeViewHostMsg_GetPluginInfo_Status;
-namespace webkit {
+namespace content {
struct WebPluginInfo;
}
@@ -41,7 +41,7 @@ class PluginPlaceholder : public content::RenderViewObserver,
content::RenderView* render_view,
WebKit::WebFrame* frame,
const WebKit::WebPluginParams& params,
- const webkit::WebPluginInfo& info,
+ const content::WebPluginInfo& info,
const std::string& identifier,
const string16& name,
int resource_id,
@@ -160,7 +160,7 @@ class PluginPlaceholder : public content::RenderViewObserver,
WebKit::WebPluginParams plugin_params_;
WebViewPlugin* plugin_;
- webkit::WebPluginInfo plugin_info_;
+ content::WebPluginInfo plugin_info_;
string16 title_;
string16 message_;