Bug 1458621 - Move Pocket pref to firefox.js draft
authorUrsula Sarracini <usarracini@mozilla.com>
Mon, 07 May 2018 15:21:44 -0400
changeset 792165 32b36f551d677429cc5e40dba9b40305bcdb6dfe
parent 792042 0e52749acd376489bb551928d2012dde10bfc41b
push id109018
push userusarracini@mozilla.com
push dateMon, 07 May 2018 19:23:48 +0000
bugs1458621
milestone61.0a1
Bug 1458621 - Move Pocket pref to firefox.js MozReview-Commit-ID: KDS1wez8erg
browser/app/profile/firefox.js
browser/extensions/pocket/bootstrap.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1612,16 +1612,17 @@ pref("browser.migrate.automigrate.inpage
 // See comments in bug 1340115 on how we got to these numbers.
 pref("browser.migrate.chrome.history.limit", 2000);
 pref("browser.migrate.chrome.history.maxAgeInDays", 180);
 
 // Enable browser frames for use on desktop.  Only exposed to chrome callers.
 pref("dom.mozBrowserFramesEnabled", true);
 
 pref("extensions.pocket.enabled", true);
+pref("extensions.pocket.oAuthConsumerKey", "40249-e88c401e1b1f2242d9e441c4");
 
 pref("signon.schemeUpgrades", true);
 
 // Enable the "Simplify Page" feature in Print Preview. This feature
 // is disabled by default in toolkit.
 pref("print.use_simplify_page", true);
 
 // Space separated list of URLS that are allowed to send objects (instead of
--- a/browser/extensions/pocket/bootstrap.js
+++ b/browser/extensions/pocket/bootstrap.js
@@ -34,18 +34,17 @@ XPCOMUtils.defineLazyGetter(this, "gPock
 // Due to bug 1051238 frame scripts are cached forever, so we can't update them
 // as a restartless add-on. The Math.random() is the work around for this.
 const PROCESS_SCRIPT = "chrome://pocket/content/pocket-content-process.js?" + Math.random();
 
 const PREF_BRANCH = "extensions.pocket.";
 const PREFS = {
   enabled: true, // bug 1229937, figure out ui tour support
   api: "api.getpocket.com",
-  site: "getpocket.com",
-  oAuthConsumerKey: "40249-e88c401e1b1f2242d9e441c4"
+  site: "getpocket.com"
 };
 
 function setDefaultPrefs() {
   let branch = Services.prefs.getDefaultBranch(PREF_BRANCH);
   for (let [key, val] of Object.entries(PREFS)) {
     // If someone beat us to setting a default, don't overwrite it.  This can
     // happen if distribution.ini sets the default first.
     if (branch.getPrefType(key) != branch.PREF_INVALID)