diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-21 00:23:26 +0000 |
| commit | c85b0ba71b5a55647b01de9d345e46896979033d (patch) | |
| tree | ae99657ca1440b7540da473e1bbe6156e43e9be3 /webkit/glue/webkit_glue.h | |
| parent | 887ba3adc7b32b7df315ef292ae9395fd75653e5 (diff) | |
| download | chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.zip chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.gz chromium_src-c85b0ba71b5a55647b01de9d345e46896979033d.tar.bz2 | |
Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69755, which broke the tree.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5998002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 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, 2 insertions, 8 deletions
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h index 38ea659..fbb541a 100644 --- a/webkit/glue/webkit_glue.h +++ b/webkit/glue/webkit_glue.h @@ -23,6 +23,7 @@ class GURL; class SkBitmap; +struct WebPluginInfo; namespace base { class StringPiece; @@ -38,12 +39,6 @@ class WebString; class WebView; } -namespace webkit { -namespace npapi { -struct WebPluginInfo; -} -} - namespace webkit_glue { @@ -230,8 +225,7 @@ 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<webkit::npapi::WebPluginInfo>* plugins); +void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins); // Returns true if the plugins run in the same process as the renderer, and // false otherwise. |