diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-20 23:42:40 +0000 |
| commit | b6badfa6a538f889025db775662fe61fcb45dc37 (patch) | |
| tree | d12fb54a46443e18a9fa9a671392966ba6751202 /chrome/browser/plugin_service.h | |
| parent | e0e75f67163f77051d8f62d5275dbf40627d5398 (diff) | |
| download | chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.zip chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.gz chromium_src-b6badfa6a538f889025db775662fe61fcb45dc37.tar.bz2 | |
Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"
Manually reverting r69766, which was itself a failed
revert of r69755.
BUG=none
TEST=none
TBR=dmaclach@chromium.org
Review URL: http://codereview.chromium.org/5996003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/plugin_service.h')
| -rw-r--r-- | chrome/browser/plugin_service.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h index e83e804..a66d76ac 100644 --- a/chrome/browser/plugin_service.h +++ b/chrome/browser/plugin_service.h @@ -41,7 +41,13 @@ class MessageLoop; class Profile; class ResourceDispatcherHost; class URLRequestContext; + + +namespace webkit { +namespace npapi { struct WebPluginInfo; +} +} // This must be created on the main thread but it's only called on the IO/file // thread. @@ -90,7 +96,7 @@ class PluginService // the given url and mime type. Must be called on the FILE thread. bool GetFirstAllowedPluginInfo(const GURL& url, const std::string& mime_type, - WebPluginInfo* info, + webkit::npapi::WebPluginInfo* info, std::string* actual_mime_type); // Returns true if the given plugin is allowed to be used by a page with |