diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 05:23:20 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 05:23:20 +0000 |
| commit | 28969526c31ebd384fe2341d5b0f8bc96a279efd (patch) | |
| tree | 002746a2f04bbcc30162d5f78e19446473df178c /webkit | |
| parent | b84d7207134739a3f9d2f1e786c62b9bd7669755 (diff) | |
| download | chromium_src-28969526c31ebd384fe2341d5b0f8bc96a279efd.zip chromium_src-28969526c31ebd384fe2341d5b0f8bc96a279efd.tar.gz chromium_src-28969526c31ebd384fe2341d5b0f8bc96a279efd.tar.bz2 | |
Remove all npapi plugins from windows metro chrome
Also remove pepflashplayer.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10408018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/plugins/npapi/plugin_list_win.cc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/webkit/plugins/npapi/plugin_list_win.cc b/webkit/plugins/npapi/plugin_list_win.cc index b26c68d..dc7cf66 100644 --- a/webkit/plugins/npapi/plugin_list_win.cc +++ b/webkit/plugins/npapi/plugin_list_win.cc @@ -16,6 +16,7 @@ #include "base/string_number_conversions.h" #include "base/string_split.h" #include "base/string_util.h" +#include "base/win/metro.h" #include "base/win/pe_image.h" #include "base/win/registry.h" #include "base/win/scoped_handle.h" @@ -344,7 +345,6 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info, (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) { if (!IsNewerVersion(plugins[j].version, info.version)) return false; // We have loaded a plugin whose version is newer. - (*plugin_groups)[i]->RemovePlugin(plugins[j].path); break; } @@ -386,6 +386,15 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info, } } + if (base::win::GetMetroModule()) { + // In metro mode we only allow internal (pepper) plugins except flash. + // TODO(cpu):remove this hack at some point in the future. + if (info.type == WebPluginInfo::PLUGIN_TYPE_NPAPI) + return false; + if (filename == L"pepflashplayer.dll") + return false; + } + // Special WMP handling // If both the new and old WMP plugins exist, only load the new one. |