From b06d2b96340a9f8bb48474dd93506da8cc40c46a Mon Sep 17 00:00:00 2001 From: "mconnor%steelgryphon.com" Date: Fri, 12 Aug 2005 07:01:09 +0000 Subject: [PATCH] bug 304403 - better safe mode UE, part 1, a=chase --- browser/base/content/browser.js | 5 ++ browser/base/content/safeMode.js | 64 ++++++++++++++++ browser/base/content/safeMode.xul | 74 +++++++++++++++++++ browser/base/jar.mn | 2 + .../bookmarks/src/nsBookmarksService.cpp | 33 +++++++++ .../locales/en-US/chrome/browser/safeMode.dtd | 58 +++++++++++++++ browser/locales/jar.mn | 1 + 7 files changed, 237 insertions(+) create mode 100644 browser/base/content/safeMode.js create mode 100644 browser/base/content/safeMode.xul create mode 100644 browser/locales/en-US/chrome/browser/safeMode.dtd diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js index 940af944614..dafd8c3d350 100644 --- a/browser/base/content/browser.js +++ b/browser/base/content/browser.js @@ -919,6 +919,11 @@ function delayedStartup() } FeedHandler.init(); + + var app = Components.classes["@mozilla.org/xre/app-info;1"].getService(Components.interfaces.nsIXULAppInfo) + .QueryInterface(Components.interfaces.nsIXULRuntime); + if (app.inSafeMode) + window.openDialog("chrome://browser/content/safeMode.xul", "_blank", "chrome,centerscreen,dependent,resizable=no"); } function BrowserShutdown() diff --git a/browser/base/content/safeMode.js b/browser/base/content/safeMode.js new file mode 100644 index 00000000000..06ed9fa330f --- /dev/null +++ b/browser/base/content/safeMode.js @@ -0,0 +1,64 @@ +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Mike Connor. +# Portions created by the Initial Developer are Copyright (C) 2005 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Mike Connor +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + + +function restartApp() { + var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"] + .getService(Components.interfaces.nsIAppStartup); + appStartup.quit(appStartup.eAttemptQuit | appStartup.eRestart); +} + +function clearAllPrefs() { + var prefService = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService); + prefService.resetUserPrefs(); +} + +function restoreDefaultBookmarks() { + var prefBranch = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefBranch); + prefBranch.setBoolPref("browser.bookmarks.restore_default_bookmarks", true); +} + +function onOK() { + if (document.getElementById("resetUserPrefs").checked) + clearAllPrefs(); + + if (document.getElementById("resetBookmarks").checked) + restoreDefaultBookmarks(); + + restartApp(); +} diff --git a/browser/base/content/safeMode.xul b/browser/base/content/safeMode.xul new file mode 100644 index 00000000000..0646738db8f --- /dev/null +++ b/browser/base/content/safeMode.xul @@ -0,0 +1,74 @@ + + +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is Mike Connor. +# Portions created by the Initial Developer are Copyright (C) 2005 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# Mike Connor +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 2 or later (the "GPL"), or +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + + +%brandDTD; + +%safeModeDTD; +]> + + + + + +