Backed out changeset 33060d0581d6 (bug 784759) for suspicion of causing frequent rc2 orange on android

This commit is contained in:
Carsten "Tomcat" Book 2014-01-29 12:17:32 +01:00
parent 2d1271c0c2
commit 5016359128

View File

@ -441,8 +441,6 @@ var BrowserApp = {
event.initEvent("UIReady", true, false);
window.dispatchEvent(event);
Services.obs.addObserver(this, "browser-delayed-startup-finished", false);
if (this._startupStatus)
this.onAppUpdated();
@ -712,6 +710,10 @@ var BrowserApp = {
},
onAppUpdated: function() {
// initialize the form history and passwords databases on upgrades
Services.obs.notifyObservers(null, "FormHistory:Init", "");
Services.obs.notifyObservers(null, "Passwords:Init", "");
// 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")) {
@ -1628,10 +1630,6 @@ var BrowserApp = {
Services.prefs.setCharPref("general.useragent.locale", aData);
break;
case "browser-delayed-startup-finished":
this._delayedStartup();
break;
default:
dump('BrowserApp.observe: unexpected topic "' + aTopic + '"\n');
break;
@ -1639,14 +1637,6 @@ var BrowserApp = {
}
},
_delayedStartup: function() {
// initialize the form history and passwords databases on upgrades
if (this._startupStatus) {
Services.obs.notifyObservers(null, "FormHistory:Init", "");
Services.obs.notifyObservers(null, "Passwords:Init", "");
}
},
get defaultBrowserWidth() {
delete this.defaultBrowserWidth;
let width = Services.prefs.getIntPref("browser.viewport.desktopWidth");