Commit 28969526 authored by cpu@chromium.org's avatar cpu@chromium.org

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
parent b84d7207
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "base/string_number_conversions.h" #include "base/string_number_conversions.h"
#include "base/string_split.h" #include "base/string_split.h"
#include "base/string_util.h" #include "base/string_util.h"
#include "base/win/metro.h"
#include "base/win/pe_image.h" #include "base/win/pe_image.h"
#include "base/win/registry.h" #include "base/win/registry.h"
#include "base/win/scoped_handle.h" #include "base/win/scoped_handle.h"
...@@ -344,7 +345,6 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info, ...@@ -344,7 +345,6 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info,
(plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) { (plugin1 == kJavaDeploy2 && plugin2 == kJavaDeploy1)) {
if (!IsNewerVersion(plugins[j].version, info.version)) if (!IsNewerVersion(plugins[j].version, info.version))
return false; // We have loaded a plugin whose version is newer. return false; // We have loaded a plugin whose version is newer.
(*plugin_groups)[i]->RemovePlugin(plugins[j].path); (*plugin_groups)[i]->RemovePlugin(plugins[j].path);
break; break;
} }
...@@ -386,6 +386,15 @@ bool PluginList::ShouldLoadPlugin(const webkit::WebPluginInfo& info, ...@@ -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 // Special WMP handling
// If both the new and old WMP plugins exist, only load the new one. // If both the new and old WMP plugins exist, only load the new one.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment