diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 06:27:50 +0000 |
| commit | 191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c (patch) | |
| tree | b982048e66a62646694c16c2cb10cb7ad30d8912 /webkit/glue/webkit_glue.h | |
| parent | cfef856dd2ccece3cea13ccc96ac9579fd2b30b5 (diff) | |
| download | chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.zip chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.gz chromium_src-191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c.tar.bz2 | |
Re-land earlier patch that moves the NPAPI implementation from webkit/glue/plugins to webkit/plugins/npapi
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69808 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webkit_glue.h')
| -rw-r--r-- | webkit/glue/webkit_glue.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index fbb541a..38ea659 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -23,7 +23,6 @@ class GURL; class SkBitmap; -struct WebPluginInfo; namespace base { class StringPiece; @@ -39,6 +38,12 @@ class WebString; class WebView; } +namespace webkit { +namespace npapi { +struct WebPluginInfo; +} +} + namespace webkit_glue { @@ -225,7 +230,8 @@ bool GetApplicationDirectory(FilePath* path); bool GetExeDirectory(FilePath* path); // Embedders implement this function to return the list of plugins to Webkit. -void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins); +void GetPlugins(bool refresh, + std::vector<webkit::npapi::WebPluginInfo>* plugins); // Returns true if the plugins run in the same process as the renderer, and // false otherwise. |