summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 19:05:02 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 19:05:02 +0000
commitd8d51968d1a0dd48eabcef6c361278fb8bf4fac3 (patch)
treec208ba2cb81e6d53d4ff5d8292ffb399270b0ad5 /webkit
parenta5a4a0b702c644c37398a3c1fbd6be568e81fc2a (diff)
downloadchromium_src-d8d51968d1a0dd48eabcef6c361278fb8bf4fac3.zip
chromium_src-d8d51968d1a0dd48eabcef6c361278fb8bf4fac3.tar.gz
chromium_src-d8d51968d1a0dd48eabcef6c361278fb8bf4fac3.tar.bz2
Un-blacklist the Shockwave plugin on Mac
BUG=20635 TEST=Shockwave content should load if the plugin is installed. Review URL: http://codereview.chromium.org/524062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/plugin_list_mac.mm1
1 files changed, 0 insertions, 1 deletions
diff --git a/webkit/glue/plugins/plugin_list_mac.mm b/webkit/glue/plugins/plugin_list_mac.mm
index add300d..1cfcdfc 100644
--- a/webkit/glue/plugins/plugin_list_mac.mm
+++ b/webkit/glue/plugins/plugin_list_mac.mm
@@ -83,7 +83,6 @@ bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
std::vector<WebPluginInfo>* plugins) {
// Plugins that we know don't work at all.
const char* blacklisted_plugin_mimes[] = {
- "application/x-director", // Crashes during initialization.
"application/x-googlegears", // Safari-specific.
"application/x-id-quakelive", // Crashes on load.
"application/x-vnd.movenetworks.qm", // Crashes on Snow Leopard.