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 /chrome/browser/plugin_service.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 'chrome/browser/plugin_service.h')
| -rw-r--r-- | chrome/browser/plugin_service.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/chrome/browser/plugin_service.h b/chrome/browser/plugin_service.h index a66d76ac..e83e804 100644 --- a/chrome/browser/plugin_service.h +++ b/chrome/browser/plugin_service.h @@ -41,13 +41,7 @@ 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. @@ -96,7 +90,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, - webkit::npapi::WebPluginInfo* info, + WebPluginInfo* info, std::string* actual_mime_type); // Returns true if the given plugin is allowed to be used by a page with |