Guest User

Untitled

a guest
Oct 11th, 2017
63
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
  2. --- a/browser/app/profile/firefox.js
  3. +++ b/browser/app/profile/firefox.js
  4. @@ -1519,31 +1519,24 @@ pref("media.gmp-provider.enabled", true)
  5.  pref("privacy.trackingprotection.ui.enabled", true);
  6.  #else
  7.  pref("privacy.trackingprotection.ui.enabled", false);
  8.  #endif
  9.  pref("privacy.trackingprotection.introCount", 0);
  10.  pref("privacy.trackingprotection.introURL", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tracking-protection/start/");
  11.  
  12.  // Enable Contextual Identity Containers
  13. -#ifdef NIGHTLY_BUILD
  14. -pref("privacy.userContext.enabled", true);
  15. -pref("privacy.userContext.ui.enabled", true);
  16. -pref("privacy.usercontext.about_newtab_segregation.enabled", true);
  17.  
  18. -// 0 disables long press, 1 when clicked, the menu is shown, 2 the menu is shown after X milliseconds.
  19. -pref("privacy.userContext.longPressBehavior", 2);
  20. -#else
  21.  pref("privacy.userContext.enabled", false);
  22.  pref("privacy.userContext.ui.enabled", false);
  23.  pref("privacy.usercontext.about_newtab_segregation.enabled", false);
  24.  
  25.  // 0 disables long press, 1 when clicked, the menu is shown, 2 the menu is shown after X milliseconds.
  26.  pref("privacy.userContext.longPressBehavior", 0);
  27. -#endif
  28. +
  29.  pref("privacy.userContext.extension", "");
  30.  
  31.  // Start the browser in e10s mode
  32.  pref("browser.tabs.remote.autostart", false);
  33.  pref("browser.tabs.remote.desktopbehavior", true);
  34.  
  35.  #if !defined(RELEASE_OR_BETA) || defined(MOZ_DEV_EDITION)
  36.  // At the moment, autostart.2 is used, while autostart.1 is unused.
  37.  
  38. diff --git a/toolkit/components/extensions/ExtensionPreferencesManager.jsm b/toolkit/components/extensions/ExtensionPreferencesManager.jsm
  39. --- a/toolkit/components/extensions/ExtensionPreferencesManager.jsm
  40. +++ b/toolkit/components/extensions/ExtensionPreferencesManager.jsm
  41. @@ -85,16 +85,21 @@ function initialValueCallback() {
  42.   * @param {Object} setting
  43.   *        An object that represents a setting, which will have a setCallback
  44.   *        property.
  45.   * @param {Object} item
  46.   *        An object that represents an item handed back from the setting store
  47.   *        from which the new pref values can be calculated.
  48.  */
  49.  function setPrefs(setting, item) {
  50. +  try {
  51. +  Cu.reportError("setting pref" + JSON.stringify(setting) + " " + JSON.stringify(item));
  52. +  } catch (e) {
  53. +    Cu.reportError("arse" + e);
  54. +  }
  55.    let prefs = item.initialValue || setting.setCallback(item.value);
  56.    for (let pref in prefs) {
  57.      if (prefs[pref] === undefined) {
  58.        Preferences.reset(pref);
  59.      } else {
  60.        Preferences.set(pref, prefs[pref]);
  61.      }
  62.    }
RAW Paste Data