Bug 1260460 - reset user's restore on demand preference since we're removing it from the UI. Follow-up: Replace "currentVersion" with "currentUIVersion" to fix XPCshell and browser-chrome bustage related to nsBrowserGlue.js. r=bustage on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 02 Apr 2016 01:30:14 +0200
changeset 291465 6f4210b98c4b8f892fafddc1ca0b1c7638427f5c
parent 291464 dbfc218a57449d4b3c0050322e47f83246600c48
child 291466 7e4c0bee56f35104a4809121e8672f1e659258f5
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
bugs1260460
milestone48.0a1
Bug 1260460 - reset user's restore on demand preference since we're removing it from the UI. Follow-up: Replace "currentVersion" with "currentUIVersion" to fix XPCshell and browser-chrome bustage related to nsBrowserGlue.js. r=bustage on a CLOSED TREE
browser/components/nsBrowserGlue.js
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2161,17 +2161,17 @@ BrowserGlue.prototype = {
     }
 
     if (currentUIVersion < 36) {
       xulStore.removeValue("chrome://passwordmgr/content/passwordManager.xul",
                            "passwordCol",
                            "hidden");
     }
 
-    if (currentVersion < 37) {
+    if (currentUIVersion < 37) {
       Services.prefs.clearUserPref("browser.sessionstore.restore_on_demand");
     }
 
     // Update the migration version.
     Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
   },
 
   _hasExistingNotificationPermission: function BG__hasExistingNotificationPermission() {