Remove remaining default plugin references. b=567464 r=jst

This commit is contained in:
Josh Aas 2010-05-26 19:18:06 -04:00
parent ac360c62dd
commit 5a542da3e9
4 changed files with 1 additions and 13 deletions

View File

@ -311,14 +311,7 @@ nsMimeType::GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin)
nsAutoString type;
GetType(type);
PRBool disabled = PR_FALSE;
if (type.Length() == 1 && type.First() == '*') {
// Check if the default plugin is disabled.
disabled = nsContentUtils::GetBoolPref("plugin.default_plugin_disabled");
}
*aEnabledPlugin = disabled ? nsnull : mPlugin;
*aEnabledPlugin = mPlugin;
NS_IF_ADDREF(*aEnabledPlugin);

View File

@ -513,7 +513,6 @@ var xml = <prefs>
<pref><name>image.animation_mode</name></pref>
<pref><name>network.http.sendRefererHeader</name></pref>
<pref><name>font.default.x-central-euro</name></pref>
<pref><name>plugin.default_plugin_disabled</name></pref>
<pref><name>network.protocol-handler.external.ms-help</name></pref>
<pref><name>font.default.x-geor</name></pref>
<pref><name>browser.download.manager.openDelay</name></pref>

View File

@ -197,7 +197,6 @@ class Firefox_runner:
userprefs.write("user_pref(\"network.proxy.autoconfig_url\", \"file://%s\");\n" % this.proxypac)
userprefs.write("user_pref(\"network.proxy.type\", 2);\n")
userprefs.write("user_pref(\"privacy.popups.firstTime\", false);\n")
userprefs.write("user_pref(\"plugin.default_plugin_disabled\", false);\n")
userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
userprefs.write("user_pref(\"dom.allow_scripts_to_close_windows\", true);\n")

View File

@ -339,9 +339,6 @@ MAKEFILES_plugin="
modules/plugin/Makefile
modules/plugin/base/src/Makefile
modules/plugin/base/public/Makefile
modules/plugin/default/mac/Makefile
modules/plugin/default/unix/Makefile
modules/plugin/default/windows/Makefile
modules/plugin/sdk/Makefile
modules/plugin/sdk/samples/Makefile
modules/plugin/sdk/samples/common/Makefile