Bug 1415727 - resetToOriginalDefaultEngine should unhide engine. r?florian
MozReview-Commit-ID: 2Z2osvN3Ir5
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -2194,21 +2194,17 @@ BrowserGlue.prototype = {
// Only reset the current engine if it wasn't set by a WebExtension
// and it is not one of the default engines.
if (currentEngine._extensionID || currentEngine._isDefault)
return;
if (currentEngine._loadPath.startsWith("[https]")) {
Services.prefs.setCharPref("browser.search.reset.status", "pending");
} else {
- // Can't call resetToOriginalDefaultEngine because it doesn't
- // unhide the engine.
- let defaultEngine = Services.search.originalDefaultEngine;
- defaultEngine.hidden = false;
- Services.search.currentEngine = defaultEngine;
+ Services.search.resetToOriginalDefaultEngine();
Services.prefs.setCharPref("browser.search.reset.status", "silent");
}
});
}
// Update the migration version.
Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
},
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -2829,17 +2829,19 @@ SearchService.prototype = {
// getEngineByName will just return null, which is the best we can do.
}
}
return this.getEngineByName(defaultEngine);
},
resetToOriginalDefaultEngine: function SRCH_SVC__resetToOriginalDefaultEngine() {
- this.currentEngine = this.originalDefaultEngine;
+ let originalDefaultEngine = this.originalDefaultEngine;
+ originalDefaultEngine.hidden = false;
+ this.currentEngine = originalDefaultEngine;
},
_buildCache: function SRCH_SVC__buildCache() {
if (this._batchTask)
this._batchTask.disarm();
let cache = {};
let locale = getLocale();