summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugin_service.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 06:27:50 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-21 06:27:50 +0000
commit191eb3f7ee90f8ce1d1bee4a37f3acee0c10068c (patch)
treeb982048e66a62646694c16c2cb10cb7ad30d8912 /chrome/browser/plugin_service.h
parentcfef856dd2ccece3cea13ccc96ac9579fd2b30b5 (diff)
downloadchromium_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 'chrome/browser/plugin_service.h')
-rw-r--r--chrome/browser/plugin_service.h8
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