зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1074933 - backout 135564e9e7f5 for autophone regressions
This commit is contained in:
Родитель
ca172ae717
Коммит
40b848e7e5
|
@ -823,32 +823,12 @@ var BrowserApp = {
|
|||
Services.obs.notifyObservers(null, "FormHistory:Init", "");
|
||||
Services.obs.notifyObservers(null, "Passwords:Init", "");
|
||||
|
||||
// Migrate the UI if necessary.
|
||||
const UI_VERSION = 1;
|
||||
|
||||
let currentUIVersion = 0;
|
||||
try {
|
||||
currentUIVersion = Services.prefs.getIntPref("browser.migration.version");
|
||||
} catch(ex) {}
|
||||
|
||||
if (currentUIVersion >= UI_VERSION) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (currentUIVersion < 1) {
|
||||
// Migrate user-set "plugins.click_to_play" pref. See bug 884694.
|
||||
// Because the default value is true, a user-set pref means that the pref was set to false.
|
||||
if (Services.prefs.prefHasUserValue("plugins.click_to_play")) {
|
||||
Services.prefs.setIntPref("plugin.default.state", Ci.nsIPluginTag.STATE_ENABLED);
|
||||
Services.prefs.clearUserPref("plugins.click_to_play");
|
||||
}
|
||||
|
||||
// Set the default search engine for the search activity.
|
||||
SearchEngines.migrateSearchActivityDefaultPref();
|
||||
}
|
||||
|
||||
// Update the migration version.
|
||||
Services.prefs.setIntPref("browser.migration.version", UI_VERSION);
|
||||
},
|
||||
|
||||
shutdown: function shutdown() {
|
||||
|
@ -6929,10 +6909,6 @@ var SearchEngines = {
|
|||
}
|
||||
},
|
||||
|
||||
migrateSearchActivityDefaultPref: function migrateSearchActivityDefaultPref() {
|
||||
Services.search.init(() => this._setSearchActivityDefaultPref(Services.search.defaultEngine));
|
||||
},
|
||||
|
||||
// Updates the search activity pref when the default engine changes.
|
||||
_setSearchActivityDefaultPref: function _setSearchActivityDefaultPref(engine) {
|
||||
// Helper function copied from nsSearchService.js. This is the logic that is used
|
||||
|
|
Загрузка…
Ссылка в новой задаче