summaryrefslogtreecommitdiffstats
path: root/webkit/glue/webkit_glue.h
diff options
context:
space:
mode:
authorcpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-14 05:24:44 +0000
committercpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-14 05:24:44 +0000
commit91d9f3d52a1e55a9938416b258e08d3cc445eae4 (patch)
tree41a281011d4ba9e327fb4e167528c99e0faec018 /webkit/glue/webkit_glue.h
parent3c8f946c38d15238f5b0793123c06859a8bc2352 (diff)
downloadchromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.zip
chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.gz
chromium_src-91d9f3d52a1e55a9938416b258e08d3cc445eae4.tar.bz2
Make WebPluginInfo more generic
- To account for pepper plugins, it grows a type field - move WebPluginInfo from webkit::npapi to webkit:: and move the files as well. This will allow us to remove hacks to get pepper plugins to load soon BUG=89248 TEST=none Review URL: http://codereview.chromium.org/7648017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.h')
-rw-r--r--webkit/glue/webkit_glue.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 1de78e6..bc68662 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -39,10 +39,8 @@ class WebView;
}
namespace webkit {
-namespace npapi {
struct WebPluginInfo;
}
-}
namespace webkit_glue {
@@ -210,7 +208,7 @@ bool ClipboardReadFilenames(ui::Clipboard::Buffer buffer,
// Embedders implement this function to return the list of plugins to Webkit.
void GetPlugins(bool refresh,
- std::vector<webkit::npapi::WebPluginInfo>* plugins);
+ std::vector<webkit::WebPluginInfo>* plugins);
// Returns true if the protocol implemented to serve |url| supports features
// required by the media engine.