Backed out changeset f1084f291de2 (bug 1386333) for Windows ts_paint crashes.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 10 Aug 2017 12:44:16 -0400
changeset 423499 57026202f82d42b14c8b4b5a2c2b7035f4a3a215
parent 423498 667773e6e8c173c6654d529e6e31afddd4659368
child 423500 2638feb177dd9104a3887fae2ce05931a6b41d6c
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1386333
milestone56.0
backs outf1084f291de27dd93e1af5776579d05a4fe93f48
Backed out changeset f1084f291de2 (bug 1386333) for Windows ts_paint crashes.
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1719,10 +1719,18 @@ pref("browser.onboarding.hidden", false)
 // if our notification is finished and safe to show their snippet.
 pref("browser.onboarding.notification.finished", false);
 pref("browser.onboarding.notification.mute-duration-on-first-session-ms", 300000); // 5 mins
 pref("browser.onboarding.notification.max-life-time-per-tour-ms", 432000000); // 5 days
 pref("browser.onboarding.notification.max-prompt-count-per-tour", 8);
 pref("browser.onboarding.newtour", "private,addons,customize,search,default,sync");
 pref("browser.onboarding.updatetour", "");
 
-// Preference that allows individual users to disable Screenshots.
+// Preferences for the Screenshots feature:
+// Temporarily disable Screenshots in Beta & Release, so that we can gradually
+// roll out the feature using SHIELD pref flipping.
+#ifdef NIGHTLY_BUILD
+pref("extensions.screenshots.system-disabled", false);
+#else
+pref("extensions.screenshots.system-disabled", true);
+#endif
+// Permanent pref that allows individual users to disable Screenshots.
 pref("extensions.screenshots.disabled", false);