Bug 1161881 - Enable Pocket by default (in supported locales). r=gavin, a=dolske a=sylvestre
authorJustin Dolske <dolske@mozilla.com>
Wed, 06 May 2015 16:20:00 -0700
changeset 265912 a02734fe6137255e861f39932874977f4800675a
parent 265911 99df7384dfc24770b624739ad17f90a5a08d66a5
child 265913 f0af8f992aeb8799b48a924571fb9c17448d2a67
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, dolske, sylvestre
bugs1161881
milestone39.0a2
Bug 1161881 - Enable Pocket by default (in supported locales). r=gavin, a=dolske a=sylvestre
browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1905,14 +1905,23 @@ pref("browser.readinglist.enabled", fals
 pref("browser.readinglist.sidebarEverOpened", false);
 pref("readinglist.scheduler.enabled", false);
 pref("readinglist.server", "https://readinglist.services.mozilla.com/v1");
 
 pref("browser.reader.detectedFirstArticle", false);
 // Don't limit how many nodes we care about on desktop:
 pref("reader.parse-node-limit", 0);
 
+<<<<<<< local
 pref("browser.pocket.enabled", false);
+=======
+// Enable Service workers for desktop on non-release builds
+#ifdef NIGHTLY_BUILD
+pref("dom.serviceWorkers.enabled", true);
+#endif
+
+pref("browser.pocket.enabled", true);
+>>>>>>> other
 pref("browser.pocket.api", "api.getpocket.com");
 pref("browser.pocket.site", "getpocket.com");
 pref("browser.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
 pref("browser.pocket.useLocaleList", true);
 pref("browser.pocket.enabledLocales", "en-US");