diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 02:42:14 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 02:42:14 +0000 |
| commit | f520b5b5e0822d6ea04edcf064274ac515581806 (patch) | |
| tree | 778819460ce7ca1fd66f97e2bed0fba0200b7eba /content/public | |
| parent | 255f8277e7e4f9e19b8f19988ded37e38c932c73 (diff) | |
| download | chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.zip chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.tar.gz chromium_src-f520b5b5e0822d6ea04edcf064274ac515581806.tar.bz2 | |
Revert r108760 / reland r108744, r108753 w/ fix
Modify code in chrome to call wrapper functions on PluginService
TBR=rsesek@chromium.org, jam@chromium.org
BUG=90442
TEST=browser_tests PluginServiceTest.* pass on the Mac
Review URL: http://codereview.chromium.org/8493026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public')
| -rw-r--r-- | content/public/common/content_client.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/public/common/content_client.h b/content/public/common/content_client.h index 7386ef7..840e370 100644 --- a/content/public/common/content_client.h +++ b/content/public/common/content_client.h @@ -29,6 +29,12 @@ namespace sandbox { class TargetPolicy; } +namespace webkit { +namespace npapi { +class PluginList; +} +} + namespace content { class ContentBrowserClient; @@ -79,6 +85,10 @@ class CONTENT_EXPORT ContentClient { virtual void AddPepperPlugins( std::vector<content::PepperPluginInfo>* plugins) = 0; + // Gives the embedder a chance to register its own internal NPAPI plugins. + virtual void AddNPAPIPlugins( + webkit::npapi::PluginList* plugin_list) = 0; + // Returns whether the given message should be allowed to be sent from a // swapped out renderer. virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) = 0; |