Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(363)

Unified Diff: webkit/plugins/npapi/plugin_list_win.cc

Issue 10408018: Remove all npapi plugins from windows metro chrome (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698