mozilla-central: changeset 195852:3ab31cfb6837bbcb7923888a44de40ad9d3d8576

author	Blair McBride <bmcbride@mozilla.com>
	Thu, 24 Jul 2014 15:37:54 +1200
changeset 195852	3ab31cfb6837bbcb7923888a44de40ad9d3d8576
parent 195851	5cebb1e06e2551a35b2e1783de5ab80b830cfb47
child 195853	24dae3787d944f6a9ac611d7ed433ffecdb22da4
push id	27198
push user	cbook@mozilla.com
push date	Thu, 24 Jul 2014 13:35:02 +0000
treeherder	mozilla-central@616e6924cb0b [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	gfritzsche
bugs	1024965
milestone	34.0a1
first release with	nightly linux32 613e79262240 / 34.0a1 / 20140725030202 / files nightly linux64 613e79262240 / 34.0a1 / 20140725030202 / files nightly mac 613e79262240 / 34.0a1 / 20140725030202 / files nightly win32 613e79262240 / 34.0a1 / 20140725030202 / files nightly win64 613e79262240 / 34.0a1 / 20140725030202 / files
last release without	nightly linux32 a91ec42d6a9c / 34.0a1 / 20140724030201 / files nightly linux64 a91ec42d6a9c / 34.0a1 / 20140724030201 / files nightly mac a91ec42d6a9c / 34.0a1 / 20140724030201 / files nightly win32 a91ec42d6a9c / 34.0a1 / 20140724030201 / files nightly win64 a91ec42d6a9c / 34.0a1 / 20140724030201 / files

--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -820,16 +820,27 @@ pref("plugins.state.nproblox", 2);
 // Box Edit, bug 1029654
 #ifdef XP_WIN
 pref("plugins.state.npboxedit", 2);
 #endif
 #ifdef XP_MACOSX
 pref("plugins.state.box edit", 2);
 #endif
 
+// Nexus Personal, bug 1024965
+#ifdef XP_WIN
+pref("plugins.state.np_prsnl", 2);
+#endif
+#ifdef XP_MACOSX
+pref("plugins.state.personalplugin", 2);
+#endif
+#ifdef UNIX_BUT_NOT_MAC
+pref("plugins.state.libplugins", 2);
+#endif
+
 // display door hanger if flash not installed
 pref("plugins.notifyMissingFlash", true);
 
 #ifdef XP_MACOSX
 pref("browser.preferences.animateFadeIn", true);
 #else
 pref("browser.preferences.animateFadeIn", false);
 #endif