summaryrefslogtreecommitdiffstats
path: root/content/shell/shell_content_client.cc
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 02:42:14 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-08 02:42:14 +0000
commitf520b5b5e0822d6ea04edcf064274ac515581806 (patch)
tree778819460ce7ca1fd66f97e2bed0fba0200b7eba /content/shell/shell_content_client.cc
parent255f8277e7e4f9e19b8f19988ded37e38c932c73 (diff)
downloadchromium_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/shell/shell_content_client.cc')
-rw-r--r--content/shell/shell_content_client.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/shell/shell_content_client.cc b/content/shell/shell_content_client.cc
index bc98458..c6bf11f 100644
--- a/content/shell/shell_content_client.cc
+++ b/content/shell/shell_content_client.cc
@@ -22,6 +22,10 @@ void ShellContentClient::AddPepperPlugins(
std::vector<content::PepperPluginInfo>* plugins) {
}
+void ShellContentClient::AddNPAPIPlugins(
+ webkit::npapi::PluginList* plugin_list) {
+}
+
bool ShellContentClient::CanSendWhileSwappedOut(const IPC::Message* msg) {
return false;
}