diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:38:12 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 21:38:12 +0000 |
| commit | b692a128b073b297a4ce2aa7c468fdd37823e3a8 (patch) | |
| tree | 3561224ba86e8eabd75f3e7a2f2343002d9a58ff /webkit/glue/webkit_glue.h | |
| parent | b07c8d9a926a89d0aa7c0de2e1d2685b728a887e (diff) | |
| download | chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.zip chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.gz chromium_src-b692a128b073b297a4ce2aa7c468fdd37823e3a8.tar.bz2 | |
Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put
them in the webkit::npapi namespace.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69755 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. |