зеркало из https://github.com/mozilla/gecko-dev.git
backing out again..., r=me
This commit is contained in:
Родитель
f7366d969a
Коммит
70d7f99a7f
|
@ -60,7 +60,6 @@ DIRS = \
|
||||||
migration \
|
migration \
|
||||||
preferences \
|
preferences \
|
||||||
search \
|
search \
|
||||||
sessionstore \
|
|
||||||
shell \
|
shell \
|
||||||
sidebar \
|
sidebar \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
|
@ -101,25 +101,6 @@ BrowserGlue.prototype = {
|
||||||
ww.openWindow(null, "chrome://browser/content/safeMode.xul",
|
ww.openWindow(null, "chrome://browser/content/safeMode.xul",
|
||||||
"_blank", "chrome,centerscreen,modal,resizable=no", null);
|
"_blank", "chrome,centerscreen,modal,resizable=no", null);
|
||||||
}
|
}
|
||||||
else {
|
|
||||||
// initialize the session-restore service
|
|
||||||
var ssEnabled = true;
|
|
||||||
var prefBranch = Components.classes["@mozilla.org/preferences-service;1"].
|
|
||||||
getService(Components.interfaces.nsIPrefBranch);
|
|
||||||
try {
|
|
||||||
ssEnabled = prefBranch.getBoolPref("browser.sessionstore.enabled");
|
|
||||||
} catch (ex) {}
|
|
||||||
|
|
||||||
if (ssEnabled) {
|
|
||||||
try {
|
|
||||||
var ss = Components.classes["@mozilla.org/browser/sessionstore;1"].
|
|
||||||
getService(Components.interfaces.nsISessionStore);
|
|
||||||
ss.init();
|
|
||||||
} catch(ex) {
|
|
||||||
dump("nsSessionStore could not be initialized: " + ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
|
|
||||||
// profile shutdown handler (contains profile cleanup routines)
|
// profile shutdown handler (contains profile cleanup routines)
|
||||||
|
|
|
@ -21,7 +21,6 @@
|
||||||
locale/browser/search.properties (%chrome/browser/search.properties)
|
locale/browser/search.properties (%chrome/browser/search.properties)
|
||||||
locale/browser/searchbar.dtd (%chrome/browser/searchbar.dtd)
|
locale/browser/searchbar.dtd (%chrome/browser/searchbar.dtd)
|
||||||
locale/browser/engineManager.dtd (%chrome/browser/engineManager.dtd)
|
locale/browser/engineManager.dtd (%chrome/browser/engineManager.dtd)
|
||||||
locale/browser/sessionstore.properties (%chrome/browser/sessionstore.properties)
|
|
||||||
locale/browser/setDesktopBackground.dtd (%chrome/browser/setDesktopBackground.dtd)
|
locale/browser/setDesktopBackground.dtd (%chrome/browser/setDesktopBackground.dtd)
|
||||||
locale/browser/shellservice.properties (%chrome/browser/shellservice.properties)
|
locale/browser/shellservice.properties (%chrome/browser/shellservice.properties)
|
||||||
#ifdef MOZ_PLACES
|
#ifdef MOZ_PLACES
|
||||||
|
|
Загрузка…
Ссылка в новой задаче