Index: webkit/plugins/npapi/plugin_list_win.cc |
=================================================================== |
--- webkit/plugins/npapi/plugin_list_win.cc (revision 137335) |
+++ webkit/plugins/npapi/plugin_list_win.cc (working copy) |
@@ -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 @@ |
(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 @@ |
} |
} |
+ 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. |