diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 23:53:17 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-04 23:53:17 +0000 |
| commit | 8dc30c4e4abf9b46668508d7997c11ab13f5e1ce (patch) | |
| tree | f62e40f9dd91ea3c63e48f88f1a3db75ccb1071e /content/shell | |
| parent | deea482147bc8ef0ba15eef386dba1af394f4bae (diff) | |
| download | chromium_src-8dc30c4e4abf9b46668508d7997c11ab13f5e1ce.zip chromium_src-8dc30c4e4abf9b46668508d7997c11ab13f5e1ce.tar.gz chromium_src-8dc30c4e4abf9b46668508d7997c11ab13f5e1ce.tar.bz2 | |
Modify code in chrome to call wrapper functions on PluginService
rather than calling into webkit::npapi::PluginList directly.
This change is necessary to ensure we only have one list when we switch
content to the component build.
R=jam@chromium.org
TBR=cpu@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/8440058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108744 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell')
| -rw-r--r-- | content/shell/shell_content_client.cc | 4 | ||||
| -rw-r--r-- | content/shell/shell_content_client.h | 2 |
2 files changed, 6 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; } diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h index 8494e99..388e200 100644 --- a/content/shell/shell_content_client.h +++ b/content/shell/shell_content_client.h @@ -19,6 +19,8 @@ class ShellContentClient : public ContentClient { virtual void SetGpuInfo(const GPUInfo& gpu_info) OVERRIDE; virtual void AddPepperPlugins( std::vector<content::PepperPluginInfo>* plugins) OVERRIDE; + virtual void AddNPAPIPlugins( + webkit::npapi::PluginList* plugin_list) OVERRIDE; virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) OVERRIDE; virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE; virtual std::string GetUserAgent(bool* overriding) const OVERRIDE; |