From a8976361c84c5669e1cbaa134ca02af03074625f Mon Sep 17 00:00:00 2001
From: "ben%bengoodger.com" <ben%bengoodger.com>
Date: Mon, 8 Mar 2004 09:56:16 +0000
Subject: [PATCH] 236744 - replace winhooks with a XP shell service to better
 allow for system integration on various platforms

---
 browser/app/Makefile.in                       |   3 +
 browser/app/document-icon.ico                 |   0
 browser/app/document.ico                      | Bin 0 -> 22486 bytes
 browser/app/firefox.ico                       | Bin 0 -> 22486 bytes
 browser/app/mozilla.ico                       |   0
 browser/app/profile/firefox.js                |   4 +
 browser/app/splash.rc                         |  25 +-
 browser/base/content/browser-sets.inc         |   2 +
 browser/base/content/browser.js               |  46 +-
 browser/base/content/setWallpaper.xul         |  22 +-
 browser/base/locale/browser.properties        |  61 --
 browser/components/Makefile.in                |   7 +-
 browser/components/build/Makefile.in          |   6 +-
 browser/components/build/nsBrowserCompsCID.h  |   6 +
 browser/components/build/nsModule.cpp         |  35 +-
 .../prefwindow/content/pref-navigator.js      |  77 +-
 .../prefwindow/content/pref-navigator.xul     |  83 +-
 .../prefwindow/locale/pref-navigator.dtd      |  31 -
 browser/components/shell/Makefile.in          |  47 ++
 browser/components/shell/jar.mn               |   4 +
 browser/components/shell/public/Makefile.in   |  38 +
 .../shell/public/nsIShellService.idl          | 104 +++
 .../shell/public/nsIWindowsShellService.idl   |  63 ++
 browser/components/shell/src/Makefile.in      |  70 ++
 .../shell/src/nsGNOMEShellService.cpp         | 102 +++
 .../shell/src/nsGNOMEShellService.h           |  57 ++
 .../shell/src/nsMacShellService.cpp           | 102 +++
 .../components/shell/src/nsMacShellService.h  |  58 ++
 .../shell/src/nsSetDefaultBrowser.js          | 168 ++++
 browser/components/shell/src/nsShellService.h |  41 +
 .../shell/src/nsWindowsShellService.cpp       | 796 ++++++++++++++++++
 .../shell/src/nsWindowsShellService.h         |  67 ++
 32 files changed, 1872 insertions(+), 253 deletions(-)
 delete mode 100644 browser/app/document-icon.ico
 create mode 100644 browser/app/document.ico
 create mode 100644 browser/app/firefox.ico
 delete mode 100644 browser/app/mozilla.ico

diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
index d5b0eab4d7b..e649554f8fd 100644
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -124,6 +124,9 @@ endif
 ifdef BUILD_STATIC_LIBS
 RCFLAGS += -DMOZ_STATIC_BUILD
 endif
+ifdef DEBUG
+RCFLAGS += -DDEBUG
+endif
 endif
 
 ifeq ($(OS_ARCH),OS2)
diff --git a/browser/app/document-icon.ico b/browser/app/document-icon.ico
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/app/document.ico b/browser/app/document.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2260cf620b451daf180dcf8120d82d7d1f927e1f
GIT binary patch
literal 22486
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

literal 0
HcmV?d00001

diff --git a/browser/app/firefox.ico b/browser/app/firefox.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5f2cce49fb05d7fef65dda059cb594cf37e623ca
GIT binary patch
literal 22486
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
aiXAC-@gGqE@5&H}KLrW_h#3it{Qm$qEvr-j

literal 0
HcmV?d00001

diff --git a/browser/app/mozilla.ico b/browser/app/mozilla.ico
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index e4ab879d6cb..42c56dbad52 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -64,6 +64,10 @@ pref("general.autoScroll", false);
 pref("general.autoScroll", true);
 #endif
 
+// Whether or not the application should check at startup each time if it 
+// is the default browser.
+pref("browser.shell.checkDefaultBrowser", true);
+
 // 0 = blank, 1 = home (browser.startup.homepage), 2 = last
 // XXXBlake Remove this stupid pref
 pref("browser.startup.page",                1);
diff --git a/browser/app/splash.rc b/browser/app/splash.rc
index abc388f3fec..79e28dfd187 100644
--- a/browser/app/splash.rc
+++ b/browser/app/splash.rc
@@ -41,29 +41,8 @@
 
 1 24 "firefox.exe.manifest"
 
-// Program icon.
-IDI_APPLICATION ICON
-	"mozilla.ico"
-
-// Splash screen dialog.
-IDD_SPLASH DIALOGEX
-	DISCARDABLE
-	0,0,0,0
-	STYLE DS_SETFOREGROUND | DS_CENTER | WS_POPUP
-    EXSTYLE WS_EX_TOOLWINDOW
-	FONT 8, "MS Sans Serif"
-	BEGIN
-		CONTROL
-            		IDB_SPLASH,
-			IDB_SPLASH,
-			"Static",
-			SS_BITMAP,
-			0,0,0,0
-	END
-
-// Splash screen bitmap.
-// IDB_SPLASH BITMAP
-// 	"splash.bmp"
+IDI_DOCUMENT ICON "document.ico"
+IDI_APPLICATION ICON "firefox.ico"
 
 STRINGTABLE DISCARDABLE
 BEGIN
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 674932df668..86f94052998 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -36,6 +36,8 @@
 # ***** END LICENSE BLOCK *****
 
   <stringbundleset id="stringbundleset"> 
+    <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+    <stringbundle id="bundle_shell" src="chrome://browser/locale/shellservice.properties"/>
     <stringbundle id="bundle_browser" src="chrome://browser/locale/browser.properties"/>
     <stringbundle id="bundle_browser_region" src="chrome://browser-region/locale/region.properties"/>
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index ceed592034b..0c38d0d1e25 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -512,16 +512,31 @@ function delayedStartup()
 
   clearObsoletePrefs();
 
-#ifdef XP_WIN
   // Perform default browser checking (after window opens).
-  try {
-    var dialogShown = Components.classes["@mozilla.org/winhooks;1"]
-                    .getService(Components.interfaces.nsIWindowsHooks)
-                    .checkSettings(window);
-  } catch(e) {
+  var shell = Components.classes["@mozilla.org/browser/shell-service;1"]
+                        .getService(Components.interfaces.nsIShellService);
+  var shouldCheck = shell.shouldCheckDefaultBrowser;
+  if (shouldCheck && !shell.isDefaultBrowser(true)) {
+    var brandBundle = document.getElementById("bundle_brand");
+    var shellBundle = document.getElementById("bundle_shell");
+    
+    var brandShortName = brandBundle.getString("brandShortName");
+    var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
+    var promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", 
+                                                        [brandShortName]);
+    var checkboxLabel = shellBundle.getString("setDefaultBrowserDontAsk");
+    const IPS = Components.interfaces.nsIPromptService;
+    var ps = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                       .getService(IPS);
+    var checkEveryTime = { value: shouldCheck };
+    var rv = ps.confirmEx(window, promptTitle, promptMessage, 
+                         (IPS.BUTTON_TITLE_YES * IPS.BUTTON_POS_0) + 
+                         (IPS.BUTTON_TITLE_NO * IPS.BUTTON_POS_1),
+                         null, null, null, checkboxLabel, checkEveryTime);
+    if (rv == 0)
+      shell.setDefaultBrowser(true);
+    shell.shouldCheckDefaultBrowser = checkEveryTime.value;
   }
-#endif
-
 }
 
 function Shutdown()
@@ -4327,20 +4342,23 @@ var MailIntegration = {
   
   readMail: function ()
   {
-    var whs = Components.classes["@mozilla.org/winhooks;1"].getService(Components.interfaces.nsIWindowsHooks);
-    whs.openDefaultClient("Mail");
+    const ss = Components.interfaces.nsIShellService;
+    var shell = Components.classes["@mozilla.org/browser/shell-service;1"].getService(ss);
+    shell.openPreferredApplication(ss.APPLICATION_MAIL);
   },
   
   readNews: function ()
   {
-    var whs = Components.classes["@mozilla.org/winhooks;1"].getService(Components.interfaces.nsIWindowsHooks);
-    whs.openDefaultClient("News");
+    const ss = Components.interfaces.nsIShellService;
+    var shell = Components.classes["@mozilla.org/browser/shell-service;1"].getService(Components.interfaces.nsIShellService);
+    shell.openPreferredApplication(ss.APPLICATION_NEWS);
   },
   
   updateUnreadCount: function ()
   {
-    var whs = Components.classes["@mozilla.org/winhooks;1"].getService(Components.interfaces.nsIWindowsHooks);
-    var unreadCount = whs.unreadMailCount;
+    var shell = Components.classes["@mozilla.org/browser/shell-service;1"]
+                          .getService(Components.interfaces.nsIWindowsShellService);
+    var unreadCount = shell.unreadMailCount;
     var message = gNavigatorBundle.getFormattedString("mailUnreadTooltip", [unreadCount]);
     var element = document.getElementById("mail-button");
     element.setAttribute("tooltiptext", message);
diff --git a/browser/base/content/setWallpaper.xul b/browser/base/content/setWallpaper.xul
index a68baefdd89..6bdbdc51c44 100755
--- a/browser/base/content/setWallpaper.xul
+++ b/browser/base/content/setWallpaper.xul
@@ -54,8 +54,8 @@
     <script type="application/x-javascript">
       <![CDATA[
         const xulNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul";
-        const winHooks = Components.interfaces.nsIWindowsHooks;
-        var gMode = winHooks.WALLPAPER_STRETCH;
+        const ISS = Components.interfaces.nsIShellService;
+        var gMode = ISS.BACKGROUND_STRETCH;
         var gMonitor;
         var gWidth, gHeight;
 
@@ -77,10 +77,10 @@
         }       
         
        function onLoad() {
-          var winhooks = Components.classes["@mozilla.org/winhooks;1"].
-                       getService(Components.interfaces.nsIWindowsHooks);
+          var shell = Components.classes["@mozilla.org/browser/shell-service;1"]
+                                .getService(Components.interfaces.nsIWindowsShellService);
           gMonitor = document.getElementById("monitor");
-          var color = winhooks.getDesktopColor();
+          var color = shell.desktopBackgroundColor;
           const rMask = 4294901760;
           const gMask = 65280;
           const bMask = 255;
@@ -124,15 +124,15 @@
           
         function onAccept() {
           var pos = parseInt(document.getElementById("menuPosition").value);
-          var winhooks = Components.classes["@mozilla.org/winhooks;1"].
-                       getService(Components.interfaces.nsIWindowsHooks);
-          winhooks.setImageAsWallpaper(window.arguments[0], false, pos);
+          var shell = Components.classes["@mozilla.org/browser/shell-service;1"]
+                                .getService(Components.interfaces.nsIWindowsShellService);
+          shell.setDesktopBackground(window.arguments[0], pos);
           
           var colorpicker = document.getElementById("desktopColor");
           var r = HexToR(colorpicker.color);
           var g = HexToG(colorpicker.color);
           var b = HexToB(colorpicker.color);
-          winhooks.setDesktopColor((r << 16) | (g << 8) | b);
+          shell.desktopBackgroundColor = (r << 16) | (g << 8) | b;
         }
         
         function updatePreviewColor(color) {
@@ -141,9 +141,9 @@
         
         function onPositionChange(val) {
           gMode = parseInt(val);
-          if (gMode == winHooks.WALLPAPER_TILE)
+          if (gMode == ISS.WALLPAPER_TILE)
             tileImage();
-          else if (gMode == winHooks.WALLPAPER_STRETCH)
+          else if (gMode == ISS.WALLPAPER_STRETCH)
             stretchImage();
           else
             centerImage();
diff --git a/browser/base/locale/browser.properties b/browser/base/locale/browser.properties
index fe2b477b29e..e69de29bb2d 100644
--- a/browser/base/locale/browser.properties
+++ b/browser/base/locale/browser.properties
@@ -1,61 +0,0 @@
-nv_done=Done
-nv_timeout=Timed Out
-nv_stopped=Stopped
-openFile=Open File
-defaultStatus=
-
-droponhomebutton=Drop a link or file to make it your home page
-droponhometitle=Set Home Page
-droponhomemsg=Do you want this document to be your new home page?
-
-jserror=An error has occurred on this page. Double click here for details.
-
-linkTargetLabel=Link will open in:
-linkHREFLabel=Location:
-
-#SessionHistory.js
-nothingAvailable=(Nothing Available)
-
-# Localization Note: Use 'true' or 'false' to control the pref:theme to 
-# show the English description or not
-# for example, in Japanese build, instead of showing English description
-# set the following value to false so it won't show up.
-showskinsdescription=true
-
-# context menu strings
-
-searchText=Search Web for "%S"
-
-blockImages=Block Images from %S
-
-SavePageTitle=Save Web Page
-SaveImageTitle=Save Picture
-SaveLinkTitle=Save As
-DefaultSaveFileName=index
-WebPageCompleteFilter=Web Page, complete
-WebPageHTMLOnlyFilter=Web Page, HTML only
-
-# LOCALIZATION NOTE (filesFolder):
-#    This is the name of the folder that is created parallel to a HTML file 
-#    when it is saved "With Images". The %S section is replaced with the
-#    leaf name of the file being saved (minus extension).
-filesFolder=%S_files
-
-saveLinkErrorMsg=The link could not be saved.  The web page might have been removed or had its name changed.
-saveLinkErrorTitle=Save Link
-addEngines=Add engines...
-
-# Default name for the Web Panels sidebar
-webPanels=Web Panels
-
-# setWallpaper confirmation dialog
-wallpaperConfirmTitle = Set Wallpaper
-wallpaperConfirmMsg   = Do you want to set this image as your desktop wallpaper?
-
-tabs.closeWarningTitle=Confirm close
-tabs.closeWarning=This Browser window has %S tabs open. Do you want to close it and all its tabs?
-tabs.closeButton=Close all tabs
-tabs.closeWarningPromptMe=Warn me when closing multiple tabs
-
-mailUnreadTooltip=Read Mail and News (%S new messages)
-mailUnreadMenuitem=Read Mail (%S new)
diff --git a/browser/components/Makefile.in b/browser/components/Makefile.in
index cbff5a3d3da..6eb71c2f07c 100644
--- a/browser/components/Makefile.in
+++ b/browser/components/Makefile.in
@@ -42,12 +42,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = bookmarks help migration history prefwindow security sidebar cookieviewer
-
-
-ifeq ($(OS_ARCH),WINNT)
-DIRS    += winhooks 
-endif
+DIRS = bookmarks help migration history prefwindow security shell sidebar cookieviewer
 
 DIRS += build
 
diff --git a/browser/components/build/Makefile.in b/browser/components/build/Makefile.in
index 8c5a135d9df..5ae74645dd1 100644
--- a/browser/components/build/Makefile.in
+++ b/browser/components/build/Makefile.in
@@ -29,7 +29,7 @@ REQUIRES = \
 	txmgr \
 	bookmarks \
 	migration \
-	winhooks \
+	shellservice \
 	$(NULL)
 
 EXPORTS = nsBrowserCompsCID.h
@@ -59,12 +59,12 @@ SHARED_LIBRARY_LIBS = \
 
 ifeq ($(OS_ARCH),WINNT)
 SHARED_LIBRARY_LIBS += \
-  $(DIST)/lib/$(LIB_PREFIX)winhooks_s.$(LIB_SUFFIX) \
   $(DIST)/lib/$(LIB_PREFIX)migration_s.$(LIB_SUFFIX) \
+  $(DIST)/lib/$(LIB_PREFIX)shellservice_s.$(LIB_SUFFIX) \
   $(NULL)
 
 LOCAL_INCLUDES  += \
-  -I$(srcdir)/../winhooks \
+  -I$(srcdir)/../shell/src \
   $(NULL)
 endif
 
diff --git a/browser/components/build/nsBrowserCompsCID.h b/browser/components/build/nsBrowserCompsCID.h
index 8b61ba965b3..c0d5efee5ea 100644
--- a/browser/components/build/nsBrowserCompsCID.h
+++ b/browser/components/build/nsBrowserCompsCID.h
@@ -73,3 +73,9 @@
 #define NS_PHOENIXPROFILEMIGRATOR_CID \
 { 0x78481e4a, 0x50e4, 0x4489, { 0xb6, 0x8a, 0xef, 0x82, 0x67, 0xe, 0xd6, 0x3f } }
 
+#define NS_SHELLSERVICE_CID \
+{ 0x63c7b9f4, 0xcc8, 0x43f8, { 0xb6, 0x66, 0xa, 0x66, 0x16, 0x55, 0xcb, 0x73 } }
+
+#define NS_SHELLSERVICE_CONTRACTID \
+  "@mozilla.org/browser/shell-service;1"
+
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
index e7b5945b53d..50890b8103b 100644
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -41,7 +41,11 @@
 #include "nsBrowserCompsCID.h"
 #include "nsBookmarksService.h"
 #ifdef XP_WIN
-#include "nsWindowsHooks.h"
+#include "nsWindowsShellService.h"
+#elif defined(XP_MACOSX)
+#include "nsMacShellService.h"
+#else
+#include "nsGNOMEShellService.h"
 #endif
 #include "nsProfileMigrator.h"
 #include "nsDogbertProfileMigrator.h"
@@ -62,7 +66,11 @@
 
 NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBookmarksService, Init)
 #ifdef XP_WIN
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsHooks)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowsShellService)
+#elif defined(XP_MACOSX)
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService)
+#else
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsGNOMEShellService)
 #endif
 
 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator)
@@ -83,11 +91,24 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsICabProfileMigrator)
 
 static const nsModuleComponentInfo components[] =
 {
-#ifdef XP_WIN
-  { NS_IWINDOWSHOOKS_CLASSNAME,
-    NS_IWINDOWSHOOKS_CID,
-    NS_IWINDOWSHOOKS_CONTRACTID,
-    nsWindowsHooksConstructor },
+#if defined(XP_WIN)
+  { "Browser Shell Shervice",
+    NS_SHELLSERVICE_CID,
+    NS_SHELLSERVICE_CONTRACTID,
+    nsWindowsShellServiceConstructor },
+
+#elif defined (XP_MACOSX)
+  { "Browser Shell Shervice",
+    NS_SHELLSERVICE_CID,
+    NS_SHELLSERVICE_CONTRACTID,
+    nsMacShellServiceConstructor },
+
+#else
+  { "Browser Shell Shervice",
+    NS_SHELLSERVICE_CID,
+    NS_SHELLSERVICE_CONTRACTID,
+    nsGNOMEShellServiceConstructor },
+
 #endif
   { "Bookmarks",
     NS_BOOKMARKS_SERVICE_CID,
diff --git a/browser/components/prefwindow/content/pref-navigator.js b/browser/components/prefwindow/content/pref-navigator.js
index 67e44092455..0932167f9a9 100644
--- a/browser/components/prefwindow/content/pref-navigator.js
+++ b/browser/components/prefwindow/content/pref-navigator.js
@@ -1,25 +1,24 @@
-# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# ***** BEGIN LICENSE BLOCK *****
 # 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
-# Doron Rosenberg.
-# Portions created by the Initial Developer are Copyright (C) 2001
+#
+# The Original Code is the Firefox Options Dialog
+#
+# The Initial Developer of the Original Code is mozilla.org.
+# Portions created by the Initial Developer are Copyright (C) 2004
 # the Initial Developer. All Rights Reserved.
-# 
+#
 # Contributor(s):
-# 
+#
 # 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"),
@@ -28,16 +27,14 @@
 # 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
+# and other provisions required by the LGPL or the GPL. 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 *****
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- */
+#
+# ***** END LICENSE BLOCK ***** -->
 
+var _elementIDs = ["browserStartupHomepage", "checkForDefault"];
+    
 const nsIPrefService    = Components.interfaces.nsIPrefService;
 const nsIPrefLocalizedString = Components.interfaces.nsIPrefLocalizedString;
 
@@ -83,8 +80,10 @@ function setHomePageToDefaultPage()
   homePageField.value = url;
 }
 
-function onOK() {
-  if (!('homepage' in parent)) return;
+function onOK() 
+{
+  if (!('homepage' in parent)) 
+    return;
 
   // Replace pipes with commas to look nicer.
   parent.homepage = parent.homepage.replace(/\|/g,', ');
@@ -99,6 +98,11 @@ function onOK() {
     if (homeButton)
       homeButton.setAttribute("tooltiptext", parent.homepage);
   }
+
+  var shell = Components.classes["@mozilla.org/browser/shell-service;1"]
+                        .getService(Components.interfaces.nsIShellService);      
+  if ("shouldBeDefaultBrowser" in parent && parent.shouldBeDefautBrowser)
+    shell.setDefaultBrowser(true);
 }
 
 function Startup()
@@ -199,3 +203,36 @@ function saveFontPrefs()
     pref.SetBoolPref(prefs[i], prefvalue)
   }
 }
+
+#ifdef XP_WIN
+function checkNow()
+{
+  var shell = Components.classes["@mozilla.org/browser/shell-service;1"]
+                        .getService(Components.interfaces.nsIShellService);
+
+  var brandBundle = document.getElementById("bundle_brand");
+  var shellBundle = document.getElementById("bundle_shell");
+  var brandShortName = brandBundle.getString("brandShortName");
+  var promptTitle = shellBundle.getString("setDefaultBrowserTitle");
+  var promptMessage;
+  const IPS = Components.interfaces.nsIPromptService;
+  var psvc = Components.classes["@mozilla.org/embedcomp/prompt-service;1"]
+                       .getService(IPS);
+//  if (!shell.isDefaultBrowser(false)) {
+    promptMessage = shellBundle.getFormattedString("setDefaultBrowserMessage", 
+                                                   [brandShortName]);
+    var rv = psvc.confirmEx(window, promptTitle, promptMessage, 
+                            (IPS.BUTTON_TITLE_YES * IPS.BUTTON_POS_0) + 
+                            (IPS.BUTTON_TITLE_NO * IPS.BUTTON_POS_1),
+                            null, null, null, null, { });
+    if (rv == 0)
+      shell.setDefaultBrowser(true);
+/*
+  }
+  else {
+    promptMessage = shellBundle.getFormattedString("alreadyDefaultBrowser",
+                                                   [brandShortName]);
+    psvc.alert(window, promptTitle, promptMessage);
+  }*/
+}
+#endif
diff --git a/browser/components/prefwindow/content/pref-navigator.xul b/browser/components/prefwindow/content/pref-navigator.xul
index cea3c0c1e55..742934b661f 100644
--- a/browser/components/prefwindow/content/pref-navigator.xul
+++ b/browser/components/prefwindow/content/pref-navigator.xul
@@ -53,81 +53,9 @@
 
   <stringbundle id="bundle_prefutilities" src="chrome://browser/locale/pref/prefutilities.properties"/>
   <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
+  <stringbundle id="bundle_shell" src="chrome://browser/locale/shellservice.properties"/>
   <script type="application/x-javascript" src="chrome://browser/content/pref/pref-navigator.js"/>
 
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["browserStartupHomepage"];
-    
-#ifdef XP_WIN
-     // "Install" the SetFields function.  This will be
-     // called whenever the Navigator pane is shown.
-     window.SetFields = function( pageData ) {
-     // Determine if we have been selected as the default browser
-     // already, and enable/disable the "Set As Default" button
-     // accordingly.
-
-     // We store our state info in the same place as the code in
-     // pref-winhooks.js uses so that this panel and the 
-     // Advanced/System panel are kept in synch.
-     if (!("winHooks" in parent)) {
-       // Neither the Advanced/System panel nor this panel has
-       // appeared.  Initialize the state information.
-       parent.winHooks = new Object;
-
-       // Get winhooks service.
-       parent.winHooks.winhooks = Components.classes[ "@mozilla.org/winhooks;1" ]
-                                            .getService( Components.interfaces.nsIWindowsHooks );
-     
-       // Extract current settings (these are what the user has checked on
-       // the Advanced/System panel).
-       parent.winHooks.prefs = parent.winHooks.winhooks.settings;
-     }
-
-     // Start by checking http/https/ftp and html/xhtml/xml.
-     var prefs = parent.winHooks.prefs;
-     if (prefs.isHandlingHTTP  &&
-         prefs.isHandlingHTTPS &&
-         prefs.isHandlingHTML  &&
-         prefs.isHandlingXHTML) {
-       // The user *wants* us to be the default, apparently.
-       // We test the registry settings using a scratch copy of the
-       // settings because we don't care about some of them, but we
-       // don't want to mess up the user's choices from the
-       // Advanced/System panel.
-       var testSettings = parent.winHooks.winhooks.settings;
-       // Test that these are set.
-       testSettings.isHandlingHTTP  = true;
-       testSettings.isHandlingHTTPS = true;
-       testSettings.isHandlingHTML  = true;
-       testSettings.isHandlingXHTML = true;
-     }
-     // Return true to tell caller to process the standard pref fields.
-     return true;
-   }
-   // "Install" the makeDefault function;
-   window.makeDefault = function() {
-     // Extract current settings (these are what the
-     // user has checked on the Advanced/System panel).
-     var settings = parent.winHooks.prefs;
-
-     // Turn on all "default browser" settings.
-     settings.isHandlingHTTP  = true;
-     settings.isHandlingHTTPS = true;
-     settings.isHandlingHTML  = true;
-     settings.isHandlingXHTML = true;
-
-     // Register callback that will be called when and if the
-     // user presses the OK button.
-     parent.hPrefWindow.registerOKCallbackFunc( function () {
-       // Apply the settings.
-       parent.winHooks.winhooks.settings = parent.winHooks.prefs;
-     } );
-    }
-#endif
-  ]]>
-  </script>
-  
   <!-- homepage specification -->
   <groupbox>
     <caption label="&header2.label;"/>
@@ -170,10 +98,11 @@
   <groupbox orient="horizontal">
     <caption label="&defaultBrowserGroup.label;"/>
       <hbox align="center" flex="1">      
-        <description>&makeDefaultText;</description>
-        <spacer flex="1"/>
-        <button label="&defaultBrowserButton.label;"
-                oncommand="makeDefault()"/>
+        <checkbox id="checkForDefault" prefstring="browser.shell.checkDefaultBrowser"
+                  label="&checkForDefault.label;" accesskey="&checkForDefault.accesskey;"
+                  flex="1"/>
+        <button label="&checkNow.label;" accesskey="&checkNow.accesskey;"
+                oncommand="checkNow()"/>
       </hbox>
    </groupbox>
 #endif
diff --git a/browser/components/prefwindow/locale/pref-navigator.dtd b/browser/components/prefwindow/locale/pref-navigator.dtd
index 1db9d259a13..e69de29bb2d 100644
--- a/browser/components/prefwindow/locale/pref-navigator.dtd
+++ b/browser/components/prefwindow/locale/pref-navigator.dtd
@@ -1,31 +0,0 @@
-<!ENTITY  lHeader                   "General">
-
-<!ENTITY  header2.label             "Home Page">
-<!ENTITY  location.label            "Location(s):">
-<!ENTITY  location.accesskey        "a">
-<!ENTITY  useCurrent.label          "Use Current Page">
-<!ENTITY  useCurrent.accesskey      "C">
-<!ENTITY  useCurrentMultiple.label  "Use Current Pages">
-<!ENTITY  useBookmark.label         "Use Bookmark...">
-<!ENTITY  useBookmark.accesskey     "U">
-<!ENTITY  useBlank.label            "Use Blank Page">
-<!ENTITY  useBlank.accesskey        "B">
-
-<!ENTITY defaultBrowserGroup.label  "Default Browser">
-<!ENTITY defaultBrowserButton.label "Set Default Browser">
-<!ENTITY makeDefaultText            "Set &brandShortName; as your default browser.">
-
-<!-- XXXben oh please, can we do better than this text-wise? -->
-<!ENTITY showConnections.label      "Connection Settings...">
-<!ENTITY showConnections.accesskey  "o">
-
-<!ENTITY proxiesInfo.label          "Set up Proxies for accessing the internet.">
-<!ENTITY connectionsInfo.caption    "Connection">
-
-<!-- XXXben can we do better than this text-wise? -->
-<!ENTITY fonts.label                        "Fonts &amp; Colors">
-<!ENTITY fontsInfo.caption                  "Fonts &amp; Colors Settings">
-<!ENTITY fontsInfo.label                    "Select default Fonts and Colors used when displaying pages.">
-
-<!ENTITY showFontsAndColors.label           "Fonts &amp; Colors...">
-<!ENTITY showFontsAndColors.accesskey       "f">
diff --git a/browser/components/shell/Makefile.in b/browser/components/shell/Makefile.in
index e69de29bb2d..d0c719f6b93 100644
--- a/browser/components/shell/Makefile.in
+++ b/browser/components/shell/Makefile.in
@@ -0,0 +1,47 @@
+# ***** BEGIN LICENSE BLOCK *****
+# 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 the Mozilla Browser code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2002
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#  Brian Ryner <bryner@brianryner.com>
+#
+# 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 *****
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public src
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/shell/jar.mn b/browser/components/shell/jar.mn
index e69de29bb2d..958bad0d979 100644
--- a/browser/components/shell/jar.mn
+++ b/browser/components/shell/jar.mn
@@ -0,0 +1,4 @@
+toolkit.jar:
+    content/global/dummyWindow.xul (content/dummyWindow.xul)
+en-US.jar:
+    locale/en-US/browser/shellservice.properties (locale/shellservice.properties)
diff --git a/browser/components/shell/public/Makefile.in b/browser/components/shell/public/Makefile.in
index e69de29bb2d..9ff3d2f1d54 100644
--- a/browser/components/shell/public/Makefile.in
+++ b/browser/components/shell/public/Makefile.in
@@ -0,0 +1,38 @@
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are 
+# Copyright (C) 2001 Netscape Communications Corporation.  All
+# Rights Reserved.
+# 
+# Contributor(s):
+#
+
+DEPTH   = ../../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = shellservice
+XPIDL_MODULE  = shellservice
+
+XPIDLSRCS = nsIShellService.idl
+
+ifeq ($(OS_ARCH),WINNT)
+XPIDLSRCS += nsIWindowsShellService.idl
+endif
+
+include $(topsrcdir)/config/rules.mk
diff --git a/browser/components/shell/public/nsIShellService.idl b/browser/components/shell/public/nsIShellService.idl
index e69de29bb2d..0cc0c1ae41c 100644
--- a/browser/components/shell/public/nsIShellService.idl
+++ b/browser/components/shell/public/nsIShellService.idl
@@ -0,0 +1,104 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@mozilla.org>
+ *
+ * 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 ***** */
+
+#include "nsISupports.idl"
+
+interface nsIDOMElement;
+
+[scriptable, uuid(7d8a7a34-f492-43c0-9657-ec7dbbeba236)]
+interface nsIShellService : nsISupports
+{
+  /**
+   * Determines whether or not Firefox is the "Default Browser."
+   * This is simply whether or not Firefox is registered to handle 
+   * http links. 
+   * 
+   * @param aStartupCheck true if this is the check being performed
+   *                      by the first browser window at startup, 
+   *                      false otherwise. 
+   */
+  boolean isDefaultBrowser(in boolean aStartupCheck);
+
+  /**
+   * Registers Firefox as the "Default Browser."
+   *
+   * @param aClaimAllTypes Register Firefox as the handler for 
+   *                       additional protocols (ftp, chrome etc)
+   *                       and web documents (.html, .xhtml etc).
+   */
+  void setDefaultBrowser(in boolean aClaimAllTypes);
+
+  /** 
+   * Used to determine whether or not to show a "Set Default Browser"
+   * query dialog. This attribute is true if the application is starting
+   * up and "browser.shell.checkDefaultBrowser" is true, otherwise it
+   * is false.
+   */
+  attribute boolean shouldCheckDefaultBrowser;
+
+  /** 
+   * Flags for positioning/sizing of the Desktop Background image.
+   */
+  const long BACKGROUND_TILE      = 0x00;
+  const long BACKGROUND_STRETCH   = 0x01;
+  const long BACKGROUND_CENTER    = 0x02;
+
+    /**
+     * Sets the desktop background image using either the HTML <IMG> 
+     * element supplied or the background image of the element supplied.
+     *
+     * @param aImageElement Either a HTML <IMG> element or an element with
+     *                      a background image from which to source the
+     *                      background image. 
+     * @param aPosition     How to place the image on the desktop
+     */
+  void setDesktopBackground(in nsIDOMElement aElement, in long aPosition);
+
+  /**
+   * Constants identifying preferred applications that can be opened with
+   * openPreferredApplication.
+   */
+  const long APPLICATION_MAIL        = 0;
+  const long APPLICATION_NEWS        = 1;
+
+  /**
+   * Opens the preferred application specified.
+   */
+  void openPreferredApplication(in long aApplication);
+
+};
+ 
diff --git a/browser/components/shell/public/nsIWindowsShellService.idl b/browser/components/shell/public/nsIWindowsShellService.idl
index e69de29bb2d..36dd5fe4837 100644
--- a/browser/components/shell/public/nsIWindowsShellService.idl
+++ b/browser/components/shell/public/nsIWindowsShellService.idl
@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger <ben@mozilla.org> (Original Author)
+ *
+ * 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 ***** */
+
+#include "nsIShellService.idl"
+
+[scriptable, uuid(45a378fd-65b7-4be8-99b3-ebbf5513fe07)]
+interface nsIWindowsShellService : nsIShellService
+{
+    /**
+    * Restores system settings to what they were before Firefox 
+    * modified them.
+    */
+    void restoreFileSettings();
+
+    /** 
+     * The desktop background color, visible when no background image is 
+     * used, or if the background image is centered and does not fill the 
+     * entire screen. A rgb value, where (r << 24 | g << 16 | b)
+     */
+    attribute unsigned long desktopBackgroundColor;
+
+    /** 
+     * The number of unread mail messages for the current user.
+     * 
+     * @return The number of unread (new) mail messages for the current user.
+     */
+    readonly attribute unsigned long unreadMailCount;
+};
+
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
index e69de29bb2d..a7bb16bbd4a 100644
--- a/browser/components/shell/src/Makefile.in
+++ b/browser/components/shell/src/Makefile.in
@@ -0,0 +1,70 @@
+#
+# The contents of this file are subject to the Netscape 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/NPL/
+#
+# 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 Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH   = ../../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH   = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = shellservice
+LIBRARY_NAME = shellservice_s
+
+REQUIRES	= \
+		  xpcom \
+		  string \
+		  dom \
+		  windowwatcher \
+		  intl \
+		  appshell \
+		  necko \
+		  layout \
+		  content \
+		  widget \
+		  imglib2 \
+		  gfx \
+		  locale \
+		  pref \
+		  $(NULL)
+
+ifeq ($(OS_ARCH),WINNT)
+CPPSRCS = nsWindowsShellService.cpp
+else
+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
+CPPSRCS = nsMacShellService.cpp
+else
+CPPSRCS = nsGNOMEShellService.cpp
+endif
+endif
+
+FORCE_STATIC_LIB = 1
+
+include $(topsrcdir)/config/rules.mk
+
+JS_SET_BROWSER_COMPONENT = nsSetDefaultBrowser.js
+
+libs::
+	$(INSTALL) $(srcdir)/$(JS_SET_BROWSER_COMPONENT) $(DIST)/bin/components
+
+clobber::
+	rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
+	rm -f $(DIST)/bin/components/$(JS_SET_BROWSER_COMPONENT)
\ No newline at end of file
diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
index e69de29bb2d..c1ad6f684d4 100644
--- a/browser/components/shell/src/nsGNOMEShellService.cpp
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -0,0 +1,102 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#include "nsCOMPtr.h"
+#include "nsGNOMEShellService.h"
+#include "nsShellService.h"
+#include "nsIServiceManager.h"
+#include "nsIPrefService.h"
+
+NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService)
+
+NS_IMETHODIMP
+nsGNOMEShellService::IsDefaultBrowser(PRBool aStartupCheck, PRBool* aIsDefaultBrowser)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGNOMEShellService::SetDefaultBrowser(PRBool aClaimAllTypes)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGNOMEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
+{
+  // If we've already checked, the browser has been started and this is a 
+  // new window open, and we don't want to check again.
+  if (mCheckedThisSession) {
+    *aResult = PR_FALSE;
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIPrefBranch> prefs;
+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (pserve)
+    pserve->GetBranch("", getter_AddRefs(prefs));
+
+  prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGNOMEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
+{
+  nsCOMPtr<nsIPrefBranch> prefs;
+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (pserve)
+    pserve->GetBranch("", getter_AddRefs(prefs));
+
+  prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGNOMEShellService::SetDesktopBackground(nsIDOMElement* aElement, 
+                                          PRInt32 aPosition)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsGNOMEShellService::OpenPreferredApplication(PRInt32 aApplication)
+{
+  return NS_OK;
+}
+
diff --git a/browser/components/shell/src/nsGNOMEShellService.h b/browser/components/shell/src/nsGNOMEShellService.h
index e69de29bb2d..d993230bbe2 100644
--- a/browser/components/shell/src/nsGNOMEShellService.h
+++ b/browser/components/shell/src/nsGNOMEShellService.h
@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#ifndef nsgnomeshellservice_h____
+#define nsgnomeshellservice_h____
+
+#include "nsIShellService.h"
+
+class nsGNOMEShellService : public nsIShellService
+{
+public:
+  nsGNOMEShellService() : mCheckedThisSession(PR_FALSE) {};
+  virtual ~nsGNOMEShellService() {};
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISHELLSERVICE
+
+protected:
+
+private:
+  PRBool    mCheckedThisSession;
+};
+
+#endif // nsgnomeshellservice_h____
diff --git a/browser/components/shell/src/nsMacShellService.cpp b/browser/components/shell/src/nsMacShellService.cpp
index e69de29bb2d..c6f4ebc5c6a 100644
--- a/browser/components/shell/src/nsMacShellService.cpp
+++ b/browser/components/shell/src/nsMacShellService.cpp
@@ -0,0 +1,102 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#include "nsCOMPtr.h"
+#include "nsIPrefService.h"
+#include "nsIServiceManager.h"
+#include "nsMacShellService.h"
+#include "nsShellService.h"
+
+NS_IMPL_ISUPPORTS1(nsMacShellService, nsIShellService)
+
+NS_IMETHODIMP
+nsMacShellService::IsDefaultBrowser(PRBool aStartupCheck, PRBool* aIsDefaultBrowser)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMacShellService::SetDefaultBrowser(PRBool aClaimAllTypes)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMacShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
+{
+  // If we've already checked, the browser has been started and this is a 
+  // new window open, and we don't want to check again.
+  if (mCheckedThisSession) {
+    *aResult = PR_FALSE;
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIPrefBranch> prefs;
+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (pserve)
+    pserve->GetBranch("", getter_AddRefs(prefs));
+
+  prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMacShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
+{
+  nsCOMPtr<nsIPrefBranch> prefs;
+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (pserve)
+    pserve->GetBranch("", getter_AddRefs(prefs));
+
+  prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMacShellService::SetDesktopBackground(nsIDOMElement* aElement, 
+                                        PRInt32 aPosition)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsMacShellService::OpenPreferredApplication(PRInt32 aApplication)
+{
+  return NS_OK;
+}
+
diff --git a/browser/components/shell/src/nsMacShellService.h b/browser/components/shell/src/nsMacShellService.h
index e69de29bb2d..2bba9c3e5fa 100644
--- a/browser/components/shell/src/nsMacShellService.h
+++ b/browser/components/shell/src/nsMacShellService.h
@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger    <ben@mozilla.org>
+ *
+ * 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 ***** */
+
+#ifndef nsmacshellservice_h____
+#define nsmacshellservice_h____
+
+#include "nsIShellService.h"
+
+class nsMacShellService : public nsIShellService
+{
+public:
+  nsMacShellService() : mCheckedThisSession(PR_FALSE) {};
+  virtual ~nsMacShellService() {};
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISHELLSERVICE
+
+protected:
+
+private:
+  PRBool    mCheckedThisSession;
+};
+
+#endif // nsmacshellservice_h____
diff --git a/browser/components/shell/src/nsSetDefaultBrowser.js b/browser/components/shell/src/nsSetDefaultBrowser.js
index e69de29bb2d..4af803bc72c 100644
--- a/browser/components/shell/src/nsSetDefaultBrowser.js
+++ b/browser/components/shell/src/nsSetDefaultBrowser.js
@@ -0,0 +1,168 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Default Browser.
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Bill Law  <law@netscape.com>
+ *
+ * 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 ***** */
+
+/* This file implements the nsICmdLineHandler interface.  See nsICmdLineHandler.idl
+ * at http://lxr.mozilla.org/seamonkey/source/xpfe/appshell/public/nsICmdLineHandler.idl.
+ *
+ * This component handles the startup command line argument of the form:
+ *   -setDefaultBrowser
+ * by making the current executable the "default browser."  It accomplishes
+ * that via use of the nsIWindowsHooks interface (see implementation below).
+ *
+ * The module is registered under the contractid
+ *   "@mozilla.org/commandlinehandler/general-startup;1?type=setDefaultBrowser"
+ *
+ * The implementation consists of a JavaScript "class" named nsKillAll,
+ * comprised of:
+ *   - a JS constructor function
+ *   - a prototype providing all the interface methods and implementation stuff
+ *
+ * In addition, this file implements an nsIModule object that registers the
+ * nsSetDefaultBrowser component.
+ */
+
+/* ctor
+ */
+function nsSetDefaultBrowser() {
+}
+
+nsSetDefaultBrowser.prototype = {
+
+    // nsICmdLineHandler interface
+    get commandLineArgument() { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; },
+    get prefNameForStartup()  { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; },
+
+    get chromeUrlForTask()    { 
+      // First, get winhooks service.
+      var shell = Components.classes["@mozilla.org/browser/shell-service;1"]
+                            .getService(Components.interfaces.nsIShellService);
+      shell.isDefaultBrowser = true;
+      
+      // Now, get the cmd line service.
+      var cmdLineService = Components.classes[ "@mozilla.org/appshell/commandLineService;1" ]
+                              .getService( Components.interfaces.nsICmdLineService );
+
+      // See if "-setDefaultBrowser" was specified.  The value will be "1" if
+      // -setDefaultBrowser is in the service's list of cmd line arguments, and
+      // null otherwise.  -setDefaultBrowser will only be in the service's
+      // arg list if the application was not already running.  That's because
+      // if it was already running, then the service reflects the arguments
+      // that were specified when *that* process was started, *not* the ones
+      // passed via IPC from the second instance.
+      var option = cmdLineService.getCmdLineValue( "-setDefaultBrowser" );
+      if (!option) {
+        // Already running, so we don't have to worry about opening
+        // another window, etc.
+        throw Components.results.NS_ERROR_NOT_AVAILABLE;
+      }
+
+      // Return URL for dummy window that will auto-close.  We do this rather
+      // than throw NS_ERROR_NOT_AVAILABLE, which *should* work, because it
+      // seems that if we don't open a window, we get a crash when trying to
+      // release this (or some other) JS component during XPCOM shutdown.
+      return "chrome://global/content/dummyWindow.xul";
+    },
+
+    get helpText()            { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; },
+    get handlesArgs()         { return false; }, 
+    get defaultArgs()         { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; }, 
+    get openWindowWithArgs()  { throw Components.results.NS_ERROR_NOT_IMPLEMENTED; }, 
+
+    // nsISupports interface
+
+    // This "class" supports nsICmdLineHandler and nsISupports.
+    QueryInterface: function (iid) {
+        if (!iid.equals(Components.interfaces.nsICmdLineHandler) &&
+            !iid.equals(Components.interfaces.nsISupports)) {
+            throw Components.results.NS_ERROR_NO_INTERFACE;
+        }
+        return this;
+    },
+
+    // This Component's module implementation.  All the code below is used to get this
+    // component registered and accessible via XPCOM.
+    module: {
+        // registerSelf: Register this component.
+        registerSelf: function (compMgr, fileSpec, location, type) {
+            var compReg = compMgr.QueryInterface( Components.interfaces.nsIComponentRegistrar );
+            compReg.registerFactoryLocation( this.cid,
+                                             "Default Browser Component",
+                                             this.contractId,
+                                             fileSpec,
+                                             location,
+                                             type );
+        },
+    
+        // getClassObject: Return this component's factory object.
+        getClassObject: function (compMgr, cid, iid) {
+            if (!cid.equals(this.cid))
+                throw Components.results.NS_ERROR_NO_INTERFACE;
+    
+            if (!iid.equals(Components.interfaces.nsIFactory))
+                throw Components.results.NS_ERROR_NOT_IMPLEMENTED;
+    
+            return this.factory;
+        },
+    
+        /* CID for this class */
+        cid: Components.ID("{C66E05DC-509C-4972-A1F2-EE5AC34B9800}"),
+    
+        /* Contract ID for this class */
+        contractId: "@mozilla.org/commandlinehandler/general-startup;1?type=setDefaultBrowser",
+    
+        /* factory object */
+        factory: {
+            // createInstance: Return a new nsSetDefaultBrowser object.
+            createInstance: function (outer, iid) {
+                if (outer != null)
+                    throw Components.results.NS_ERROR_NO_AGGREGATION;
+    
+                return (new nsSetDefaultBrowser()).QueryInterface(iid);
+            }
+        },
+    
+        // canUnload: n/a (returns true)
+        canUnload: function(compMgr) {
+            return true;
+        }
+    }
+}
+
+// NSGetModule: Return the nsIModule object.
+function NSGetModule(compMgr, fileSpec) {
+    return nsSetDefaultBrowser.prototype.module;
+}
diff --git a/browser/components/shell/src/nsShellService.h b/browser/components/shell/src/nsShellService.h
index e69de29bb2d..29a788b05b6 100644
--- a/browser/components/shell/src/nsShellService.h
+++ b/browser/components/shell/src/nsShellService.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *
+ * 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 ***** */
+
+#define PREF_CHECKDEFAULTBROWSER "browser.shell.checkDefaultBrowser"
+
+#define SHELLSERVICE_PROPERTIES "chrome://browser/locale/shellservice.properties"
+#define BRAND_PROPERTIES "chrome://global/locale/brand.properties"
+
diff --git a/browser/components/shell/src/nsWindowsShellService.cpp b/browser/components/shell/src/nsWindowsShellService.cpp
index e69de29bb2d..923c7390cd7 100644
--- a/browser/components/shell/src/nsWindowsShellService.cpp
+++ b/browser/components/shell/src/nsWindowsShellService.cpp
@@ -0,0 +1,796 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger    <ben@mozilla.org>     (Clients, Mail, New Default Browser)
+ *  Joe Hewitt     <hewitt@netscape.com> (Set Background)
+ *  Blake Ross     <blake@blakeross.com> (Desktop Color)
+ *
+ * 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 ***** */
+
+#include "gfxIImageFrame.h"
+#include "imgIContainer.h"
+#include "imgIRequest.h"
+#include "nsIContent.h"
+#include "nsIDocument.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMHTMLImageElement.h"
+#include "nsIFrame.h"
+#include "nsIImageLoadingContent.h"
+#include "nsIOutputStream.h"
+#include "nsIPrefService.h"
+#include "nsIPresShell.h"
+#include "nsIServiceManager.h"
+#include "nsIStringBundle.h"
+#include "nsNetUtil.h"
+#include "nsShellService.h"
+#include "nsWindowsShellService.h"
+
+#define MOZ_HWND_BROADCAST_MSG_TIMEOUT 5000
+#define MOZ_BACKUP_REGISTRY "SOFTWARE\\Mozilla\\Desktop"
+
+#ifndef MAX_BUF
+#define MAX_BUF 4096
+#endif
+
+#define REG_SUCCEEDED(val) \
+  (val == ERROR_SUCCESS)
+
+#define REG_FAILED(val) \
+  (val != ERROR_SUCCESS)
+
+NS_IMPL_ISUPPORTS2(nsWindowsShellService, nsIWindowsShellService, nsIShellService)
+
+///////////////////////////////////////////////////////////////////////////////
+// Default Browser Registry Settings
+//
+// - File Extension Mappings
+//   -----------------------
+//   The following file extensions:
+//    .htm .html .shtml .xht .xhtml 
+//   are mapped like so:
+//
+//   HKLM\SOFTWARE\Classes\.<ext>\      (default)   REG_SZ  FirefoxHTML
+//
+//   as aliases to the class:
+//
+//   HKLM\SOFTWARE\Classes\FirefoxHTML\
+//     DefaultIcon                      (default)   REG_SZ  <appname>,1
+//     shell\open\command               (default)   REG_SZ  <appname> -url "%1"
+//
+// - Protocol Mappings
+//   -----------------
+//   The following protocols:
+//    HTTP, HTTPS, FTP, GOPHER, CHROME
+//   are mapped like so:
+//
+//   HKLM\SOFTWARE\Classes\<protocol>\
+//     DefaultIcon                      (default)   REG_SZ  <appname>,1
+//     shell\open\command               (default)   REG_SZ  <appname> -url "%1"
+//     shell\open\ddeexec               (default)   REG_SZ  "%1",,-1,0,,,,
+//                       \application   (default)   REG_SZ  Firefox
+//                       \topic         (default)   REG_SZ  WWW_OpenURL
+//                    
+//
+// - Windows XP Start Menu Browser
+//   -----------------------------
+//   The following keys are set to make Firefox appear in the Windows XP
+//   Start Menu as the browser:
+//   
+//   HKLM\SOFTWARE\Clients\StartMenuInternet
+//     firefox.exe\DefaultIcon             (default)   REG_SZ  <appname>,0
+//     firefox.exe\shell\open\command      (default)   REG_SZ  <appname>
+//     firefox.exe\shell\properties        (default)   REG_SZ  Firefox &Options
+//     firefox.exe\shell\properties\command(default)   REG_SZ  <appname> -chrome "chrome://browser/content/pref.xul"
+//
+// - Uninstall Information
+//   ---------------------
+//   Every key that is set has the previous value stored in:
+//    
+//   HKLM\SOFTWARE\Mozilla\Desktop\        <keyname>   REG_SZ oldval
+//
+//   If there is no previous value, an empty value is set to indicate that the
+//   key should be removed completely. 
+//
+
+typedef enum { NO_SUBSTITUTION    = 0x00,
+               PATH_SUBSTITUTION  = 0x01,
+               EXE_SUBSTITUTION   = 0x02,
+               NON_ESSENTIAL      = 0x04,} SettingFlags;
+typedef struct {
+  char* keyName;
+  char* valueName;
+  char* valueData;
+
+  PRInt32 flags;
+} SETTING;
+
+#define SMI "SOFTWARE\\Clients\\StartMenuInternet\\"
+#define CLS "SOFTWARE\\Classes\\"
+#define DI "\\DefaultIcon"
+#define SOP "\\shell\\open\\command"
+#define EXE "firefox.exe"
+
+#define CLS_HTML "FirefoxHTML"
+#define VAL_ICON "%APPPATH%,1"
+#define VAL_OPEN "%APPPATH% -url \"%1\""
+
+#define MAKE_KEY_NAME1(PREFIX, MID) \
+  PREFIX MID
+
+#define MAKE_KEY_NAME2(PREFIX, MID, SUFFIX) \
+  PREFIX MID SUFFIX
+
+static SETTING gSettings[] = {
+  // File Extension Aliases
+  { MAKE_KEY_NAME1(CLS, ".htm"),    "", CLS_HTML, NO_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME1(CLS, ".html"),   "", CLS_HTML, NO_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME1(CLS, ".shtml"),  "", CLS_HTML, NO_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME1(CLS, ".xht"),    "", CLS_HTML, NO_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME1(CLS, ".xhtml"),  "", CLS_HTML, NO_SUBSTITUTION | NON_ESSENTIAL },
+
+  // File Extension Class
+  { MAKE_KEY_NAME2(CLS, CLS_HTML, DI),  "", VAL_ICON, PATH_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME2(CLS, CLS_HTML, SOP), "", VAL_OPEN, PATH_SUBSTITUTION | NON_ESSENTIAL },
+
+  // Protocol Handlers
+  { MAKE_KEY_NAME2(CLS, "HTTP", DI),    "", VAL_ICON, PATH_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "HTTP", SOP),   "", VAL_OPEN, PATH_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "HTTPS", DI),   "", VAL_ICON, PATH_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "HTTPS", SOP),  "", VAL_OPEN, PATH_SUBSTITUTION },
+  { MAKE_KEY_NAME2(CLS, "FTP", DI),     "", VAL_ICON, PATH_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME2(CLS, "FTP", SOP),    "", VAL_OPEN, PATH_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME2(CLS, "GOPHER", DI),  "", VAL_ICON, PATH_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME2(CLS, "GOPHER", SOP), "", VAL_OPEN, PATH_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME2(CLS, "CHROME", DI),  "", VAL_ICON, PATH_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME2(CLS, "CHROME", SOP), "", VAL_OPEN, PATH_SUBSTITUTION | NON_ESSENTIAL },
+
+  // Windows XP Start Menu
+  { MAKE_KEY_NAME2(SMI, "%APPEXE%", DI),  
+    "", 
+    "%APPPATH%,0", 
+    PATH_SUBSTITUTION | EXE_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME2(SMI, "%APPEXE%", SOP), 
+    "", 
+    "%APPPATH%",   
+    PATH_SUBSTITUTION | EXE_SUBSTITUTION | NON_ESSENTIAL },
+  { MAKE_KEY_NAME1(SMI, "%APPEXE%\\shell\\properties\\command"),
+    "", 
+    "%APPPATH% -chrome \"chrome://browser/content/pref/pref.xul\"",   
+    PATH_SUBSTITUTION | EXE_SUBSTITUTION | NON_ESSENTIAL }
+
+  // The value of the menu must be set by hand, since it contains a localized
+  // string.
+  //     firefox.exe\shell\properties        (default)   REG_SZ  Firefox &Options
+};
+
+NS_IMETHODIMP
+nsWindowsShellService::IsDefaultBrowser(PRBool aStartupCheck, PRBool* aIsDefaultBrowser)
+{
+  SETTING* settings;
+  SETTING* end = gSettings + sizeof(gSettings)/sizeof(SETTING);
+
+  *aIsDefaultBrowser = PR_TRUE;
+
+  nsCAutoString appPath;
+  char buf[MAX_BUF];
+  ::GetModuleFileName(NULL, buf, sizeof(buf));
+  ::GetShortPathName(buf, buf, sizeof(buf));
+  ToUpperCase(appPath = buf);
+
+  PRInt32 n = appPath.RFind("\\");
+  nsCAutoString exeName;
+  if (n != kNotFound) 
+    exeName = Substring(appPath, n + 1, appPath.Length() - (n - 1));
+  else
+    exeName = appPath;
+
+  char currValue[MAX_BUF];
+  for (settings = gSettings; settings < end; ++settings) {
+    if (settings->flags & NON_ESSENTIAL)
+      continue; // This is not a registry key that determines whether
+                // or not we consider Firefox the "Default Browser."
+
+    nsCAutoString data(settings->valueData);
+    nsCAutoString key(settings->keyName);
+    if (settings->flags & PATH_SUBSTITUTION) {
+      PRInt32 offset = data.Find("%APPPATH%");
+      data.Replace(offset, 9, appPath);
+    }
+    if (settings->flags & EXE_SUBSTITUTION) {
+      PRInt32 offset = key.Find("%APPEXE%");
+      key.Replace(offset, 8, exeName);
+    }
+
+    ::ZeroMemory(currValue, sizeof(currValue));
+    HKEY theKey;
+    DWORD result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, 
+                                  key.get(), 0, KEY_READ, &theKey);
+    if (REG_SUCCEEDED(result)) {
+      DWORD len = sizeof currValue;
+      DWORD result = ::RegQueryValueEx(theKey, settings->valueName, NULL, NULL, (LPBYTE)currValue, &len);
+      if (REG_FAILED(result) || strcmp(data.get(), currValue) != 0) {
+        // Key wasn't set, or was set to something else (something else became the default browser)
+        *aIsDefaultBrowser = PR_FALSE;
+        break;
+      }
+    }
+  }
+
+  // If this is the first browser window, maintain internal state that we've
+  // checked this session (so that subsequent window opens don't show the 
+  // default browser dialog).
+  if (aStartupCheck)
+    mCheckedThisSession = PR_TRUE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::SetDefaultBrowser(PRBool aClaimAllTypes)
+{
+  // Locate the Backup key
+  HKEY backupKey;
+  DWORD result = ::RegOpenKey(HKEY_LOCAL_MACHINE, MOZ_BACKUP_REGISTRY, &backupKey);
+  if (result == ERROR_FILE_NOT_FOUND)
+    result = ::RegCreateKey(HKEY_LOCAL_MACHINE, MOZ_BACKUP_REGISTRY, &backupKey);
+
+  SETTING* settings;
+  SETTING* end = gSettings + sizeof(gSettings)/sizeof(SETTING);
+
+  nsCAutoString appPath;
+  char buf[MAX_BUF];
+  ::GetModuleFileName(NULL, buf, sizeof(buf));
+  ::GetShortPathName(buf, buf, sizeof(buf));
+  ToUpperCase(appPath = buf);
+
+  PRInt32 n = appPath.RFind("\\");
+  nsCAutoString exeName;
+  if (n != kNotFound) 
+    exeName = Substring(appPath, n + 1, appPath.Length() - (n - 1));
+  else
+    exeName = appPath;
+
+  for (settings = gSettings; settings < end; ++settings) {
+    nsCAutoString data(settings->valueData);
+    nsCAutoString key(settings->keyName);
+    if (settings->flags & PATH_SUBSTITUTION) {
+      PRInt32 offset = data.Find("%APPPATH%");
+      data.Replace(offset, 9, appPath);
+    }
+    if (settings->flags & EXE_SUBSTITUTION) {
+      PRInt32 offset = key.Find("%APPEXE%");
+      key.Replace(offset, 8, exeName);
+    }
+
+    PRBool replaceExisting = aClaimAllTypes ? PR_TRUE : !(settings->flags & NON_ESSENTIAL);
+    SetRegKey(key.get(), settings->valueName, data.get(),
+              PR_TRUE, backupKey, replaceExisting);
+  }
+
+  // Select the Default Browser for the Windows XP Start Menu
+  SetRegKey(NS_LITERAL_CSTRING(SMI).get(), "", exeName.get(), PR_TRUE, backupKey, aClaimAllTypes);
+
+  nsCOMPtr<nsIStringBundleService> bundleService(do_GetService("@mozilla.org/intl/stringbundle;1"));
+  nsCOMPtr<nsIStringBundle> bundle, brandBundle;
+  bundleService->CreateBundle(SHELLSERVICE_PROPERTIES, getter_AddRefs(bundle));
+  bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle));
+
+  // Set the Start Menu item subtitle
+  nsXPIDLString brandFullName;
+  brandBundle->GetStringFromName(NS_LITERAL_STRING("brandFullName").get(),
+                                 getter_Copies(brandFullName));
+  nsCAutoString key1(NS_LITERAL_CSTRING(SMI));
+  key1.Append(exeName);
+  key1.Append("\\");
+  SetRegKey(key1.get(), "", NS_ConvertUCS2toUTF8(brandFullName).get(), PR_TRUE, backupKey, aClaimAllTypes);
+  
+  // Set the Options menu item title
+  nsXPIDLString brandShortName;
+  brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),
+                                 getter_Copies(brandShortName));
+  const PRUnichar* brandNameStrings[] = { brandShortName.get() };
+  nsXPIDLString optionsTitle;
+  bundle->FormatStringFromName(NS_LITERAL_STRING("optionsLabel").get(),
+                               brandNameStrings, 1, getter_Copies(optionsTitle));
+
+  
+  nsCAutoString key2(NS_LITERAL_CSTRING(SMI "%APPEXE%\\shell\\properties"));
+  PRInt32 offset = key2.Find("%APPEXE%");
+  key2.Replace(offset, 8, exeName);
+  SetRegKey(key2.get(), "", NS_ConvertUCS2toUTF8(optionsTitle).get(), PR_TRUE, backupKey, aClaimAllTypes);
+
+  // Refresh the Shell
+  ::SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, NULL,
+                       (LPARAM)"SOFTWARE\\Clients\\StartMenuInternet",
+                       SMTO_NORMAL|SMTO_ABORTIFHUNG,
+                       MOZ_HWND_BROADCAST_MSG_TIMEOUT, NULL);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::RestoreFileSettings()
+{
+  // Locate the Backup key
+  HKEY backupKey;
+  DWORD result = ::RegOpenKey(HKEY_LOCAL_MACHINE, MOZ_BACKUP_REGISTRY, &backupKey);
+  if (result == ERROR_FILE_NOT_FOUND)
+    result = ::RegCreateKey(HKEY_LOCAL_MACHINE, MOZ_BACKUP_REGISTRY, &backupKey);
+
+  DWORD i = 0;
+  do {
+    char origKeyName[MAX_BUF];
+    DWORD len = sizeof origKeyName;
+    result = ::RegEnumValue(backupKey, i++, origKeyName, &len, 0, 0, 0, 0);
+    if (REG_SUCCEEDED(result)) {
+      char origValue[MAX_BUF];
+      DWORD len = sizeof origValue;
+      result = ::RegQueryValueEx(backupKey, origKeyName, NULL, NULL, (LPBYTE)origValue, &len);
+      if (REG_SUCCEEDED(result)) {
+        HKEY origKey;
+        result = ::RegOpenKeyEx(NULL, origKeyName, 0, KEY_READ, &origKey);
+        if (REG_SUCCEEDED(result))
+          result = ::RegSetValueEx(origKey, "", 0, REG_SZ, (LPBYTE)origValue, len);
+      }
+    }
+    else
+      break;
+  }
+  while (1);
+
+  // Refresh the Shell
+  ::SendMessageTimeout(HWND_BROADCAST, WM_SETTINGCHANGE, NULL,
+                       (LPARAM)"SOFTWARE\\Clients\\StartMenuInternet",
+                       SMTO_NORMAL|SMTO_ABORTIFHUNG,
+                       MOZ_HWND_BROADCAST_MSG_TIMEOUT, NULL);
+  return NS_OK;
+}
+
+void
+nsWindowsShellService::SetRegKey(const char* aKeyName, const char* aValueName, 
+                                 const char* aValue, PRBool aBackup,
+                                 HKEY aBackupKey, PRBool aReplaceExisting)
+{
+  char buf[MAX_BUF];
+  DWORD len = sizeof buf;
+
+  HKEY theKey;
+  DWORD result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, aKeyName, 0, KEY_READ | KEY_WRITE, &theKey);
+  if (result == ERROR_FILE_NOT_FOUND) 
+    result = ::RegCreateKey(HKEY_LOCAL_MACHINE, aKeyName, &theKey);
+  if (REG_FAILED(result))
+    return;
+
+  // If we're not allowed to replace an existing key, and one exists (i.e. the
+  // result isn't ERROR_FILE_NOT_FOUND, then just return now. 
+  if (!aReplaceExisting)
+    return;
+
+  // Get the old value
+  result = ::RegQueryValueEx(theKey, aValueName, NULL, NULL, (LPBYTE)buf, &len);
+
+  // Back up the old value
+  if (aBackup && REG_SUCCEEDED(result))
+    ::RegSetValueEx(aBackupKey, aKeyName, 0, REG_SZ, (LPBYTE)buf, len);
+
+  // Set the new value
+  if (REG_FAILED(result) || strcmp(buf, aValue) != 0)
+    ::RegSetValueEx(theKey, aValueName, 0, REG_SZ, 
+                    (LPBYTE)aValue, nsDependentCString(aValue).Length());
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::GetShouldCheckDefaultBrowser(PRBool* aResult)
+{
+  // If we've already checked, the browser has been started and this is a 
+  // new window open, and we don't want to check again.
+  if (mCheckedThisSession) {
+    *aResult = PR_FALSE;
+    return NS_OK;
+  }
+
+  nsCOMPtr<nsIPrefBranch> prefs;
+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (pserve)
+    pserve->GetBranch("", getter_AddRefs(prefs));
+
+  prefs->GetBoolPref(PREF_CHECKDEFAULTBROWSER, aResult);
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck)
+{
+  nsCOMPtr<nsIPrefBranch> prefs;
+  nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID));
+  if (pserve)
+    pserve->GetBranch("", getter_AddRefs(prefs));
+
+  prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck);
+
+  return NS_OK;
+}
+
+nsresult
+WriteBitmap(nsString& aPath, gfxIImageFrame* aImage)
+{
+  PRInt32 width, height;
+  aImage->GetWidth(&width);
+  aImage->GetHeight(&height);
+
+  PRUint8* bits;
+  PRUint32 length;
+  aImage->GetImageData(&bits, &length);
+  if (!bits) return NS_ERROR_FAILURE;
+
+  PRUint32 bpr;
+  aImage->GetImageBytesPerRow(&bpr);
+  PRInt32 bitCount = bpr/width;
+
+  // initialize these bitmap structs which we will later
+  // serialize directly to the head of the bitmap file
+  LPBITMAPINFOHEADER bmi = (LPBITMAPINFOHEADER)new BITMAPINFO;
+  bmi->biSize = sizeof(BITMAPINFOHEADER);
+  bmi->biWidth = width;
+  bmi->biHeight = height;
+  bmi->biPlanes = 1;
+  bmi->biBitCount = (WORD)bitCount*8;
+  bmi->biCompression = BI_RGB;
+  bmi->biSizeImage = 0; // don't need to set this if bmp is uncompressed
+  bmi->biXPelsPerMeter = 0;
+  bmi->biYPelsPerMeter = 0;
+  bmi->biClrUsed = 0;
+  bmi->biClrImportant = 0;
+
+  BITMAPFILEHEADER bf;
+  bf.bfType = 0x4D42; // 'BM'
+  bf.bfReserved1 = 0;
+  bf.bfReserved2 = 0;
+  bf.bfOffBits = sizeof(BITMAPFILEHEADER) + sizeof(BITMAPINFOHEADER);
+  bf.bfSize = bf.bfOffBits + bmi->biSizeImage;
+
+  // get a file output stream
+  nsresult rv;
+  nsCOMPtr<nsILocalFile> path;
+  rv = NS_NewLocalFile(aPath, PR_TRUE, getter_AddRefs(path));
+
+  if (NS_FAILED(rv))
+    return rv;
+
+  nsCOMPtr<nsIOutputStream> stream;
+  NS_NewLocalFileOutputStream(getter_AddRefs(stream), path);
+
+  // write the bitmap headers and rgb pixel data to the file
+  rv = NS_ERROR_FAILURE;
+  if (stream) {
+    PRUint32 written;
+    stream->Write((const char*)&bf, sizeof(BITMAPFILEHEADER), &written);
+    if (written == sizeof(BITMAPFILEHEADER)) {
+      stream->Write((const char*)bmi, sizeof(BITMAPINFOHEADER), &written);
+      if (written == sizeof(BITMAPINFOHEADER)) {
+        stream->Write((const char*)bits, length, &written);
+        if (written == length)
+          rv = NS_OK;
+      }
+    }
+
+    stream->Close();
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement, 
+                                            PRInt32 aPosition)
+{
+  nsresult rv;
+
+  nsCOMPtr<gfxIImageFrame> gfxFrame;
+
+  nsCOMPtr<nsIDOMHTMLImageElement> imgElement(do_QueryInterface(aElement));
+  if (!imgElement) {
+    // XXX write background loading stuff!
+  } 
+  else {
+    nsCOMPtr<nsIImageLoadingContent> imageContent = do_QueryInterface(aElement, &rv);
+    if (!imageContent) return rv;
+
+    // get the image container
+    nsCOMPtr<imgIRequest> request;
+    rv = imageContent->GetRequest(nsIImageLoadingContent::CURRENT_REQUEST,
+                                  getter_AddRefs(request));
+    if (!request) return rv;
+    nsCOMPtr<imgIContainer> container;
+    rv = request->GetImage(getter_AddRefs(container));
+    if (!request) return rv;
+
+    // get the current frame, which holds the image data
+    container->GetCurrentFrame(getter_AddRefs(gfxFrame));
+  }
+
+  if (!gfxFrame)
+    return NS_ERROR_FAILURE;
+
+  // get the windows directory ('c:\windows' usually)
+  char winDir[256];
+  ::GetWindowsDirectory(winDir, sizeof(winDir));
+  nsAutoString winPath;
+  winPath.AssignWithConversion(winDir);
+
+  // get the product brand name from localized strings
+  nsXPIDLString brandName;
+  nsCID bundleCID = NS_STRINGBUNDLESERVICE_CID;
+  nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(bundleCID));
+  if (bundleService) {
+    nsCOMPtr<nsIStringBundle> brandBundle;
+    rv = bundleService->CreateBundle("chrome://global/locale/brand.properties",
+                                     getter_AddRefs(brandBundle));
+    if (NS_SUCCEEDED(rv) && brandBundle) {
+      if (NS_FAILED(rv = brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),
+                            getter_Copies(brandName))))
+        return rv;
+    }
+  }
+
+  // build the file name
+  winPath.Append(NS_LITERAL_STRING("\\").get());
+  winPath.Append(brandName);
+  winPath.Append(NS_LITERAL_STRING(" Wallpaper.bmp").get());
+
+  // write the bitmap to a file in the windows dir
+  rv = WriteBitmap(winPath, gfxFrame);
+
+  // if the file was written successfully, set it as the system wallpaper
+  if (NS_SUCCEEDED(rv)) {
+     char   subKey[] = "Control Panel\\Desktop";
+     PRBool result = PR_FALSE;
+     DWORD  dwDisp = 0;
+     HKEY   key;
+     // Try to create/open a subkey under HKLM.
+     DWORD rc = ::RegCreateKeyEx( HKEY_CURRENT_USER,
+                                  subKey,
+                                  0,
+                                  NULL,
+                                  REG_OPTION_NON_VOLATILE,
+                                  KEY_WRITE,
+                                  NULL,
+                                  &key,
+                                  &dwDisp );
+    if (REG_SUCCEEDED(rc)) {
+      unsigned char tile[2];
+      unsigned char style[2];
+      if (aPosition == BACKGROUND_TILE) {
+        tile[0] = '1';
+        style[0] = '1';
+      }
+      else if (aPosition == BACKGROUND_CENTER) {
+        tile[0] = '0';
+        style[0] = '0';
+      }
+      else if (aPosition == BACKGROUND_STRETCH) {
+        tile[0] = '0';
+        style[0] = '2';
+      }
+      tile[1] = '\0';
+      style[1] = '\0';
+      ::RegSetValueEx(key, "TileWallpaper", 0, REG_SZ, tile, sizeof(tile));
+      ::RegSetValueEx(key, "WallpaperStyle", 0, REG_SZ, style, sizeof(style));
+      ::SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, ToNewCString(winPath), SPIF_UPDATEINIFILE | SPIF_SENDWININICHANGE);
+    }
+  }
+  return rv;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::OpenPreferredApplication(PRInt32 aApplication)
+{
+  nsCAutoString application;
+  switch (aApplication) {
+  case nsIShellService::APPLICATION_MAIL:
+    application = NS_LITERAL_CSTRING("Mail");
+    break;
+  case nsIShellService::APPLICATION_NEWS:
+    application = NS_LITERAL_CSTRING("News");
+    break;
+  }
+
+  // The Default Client section of the Windows Registry looks like this:
+  // 
+  // Clients\aClient\
+  //  e.g. aClient = "Mail"...
+  //        \Mail\(default) = Client Subkey Name
+  //             \Client Subkey Name
+  //             \Client Subkey Name\shell\open\command\ 
+  //             \Client Subkey Name\shell\open\command\(default) = path to exe
+  //
+  nsCAutoString clientKey(NS_LITERAL_CSTRING("SOFTWARE\\Clients\\"));
+  clientKey += application;
+
+  // Find the default application for this class.
+  HKEY theKey;
+  DWORD result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, clientKey.get(),
+                                0, KEY_READ, &theKey);
+  if (REG_FAILED(result))
+    return NS_OK;
+
+  char buf[MAX_BUF];
+  DWORD type, len = sizeof buf;
+  result = ::RegQueryValueEx(theKey, "", 0, &type, (LPBYTE)&buf, &len);
+  if (REG_FAILED(result) || nsDependentCString(buf).IsEmpty()) 
+    return NS_OK;
+
+  // Find the "open" command
+  clientKey.Append("\\");
+  clientKey.Append(buf);
+  clientKey.Append("\\shell\\open\\command");
+
+  result = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, clientKey.get(),
+                          0, KEY_READ, &theKey);
+  if (REG_FAILED(result))
+    return NS_OK;
+
+  ::ZeroMemory(buf, sizeof(buf));
+  len = sizeof buf;
+  result = ::RegQueryValueEx(theKey, "", 0, &type, (LPBYTE)&buf, &len);
+  if (REG_FAILED(result) || nsDependentCString(buf).IsEmpty()) 
+    return NS_OK;
+
+  nsCAutoString path; path.Assign(buf);
+
+  // Look for any embedded environment variables and substitute their 
+  // values, as |::CreateProcess| is unable to do this. 
+  PRInt32 end = path.Length();
+  PRInt32 cursor = 0, temp = 0;
+  ::ZeroMemory(buf, sizeof(buf));
+  do {
+    cursor = path.FindChar('%', cursor);
+    if (cursor < 0) 
+      break;
+
+    temp = path.FindChar('%', cursor + 1);
+
+    ++cursor;
+
+    ::ZeroMemory(&buf, sizeof(buf));
+    ::GetEnvironmentVariable(nsCAutoString(Substring(path, cursor, temp - cursor)).get(), 
+                             buf, sizeof(buf));
+    
+    // "+ 2" is to subtract the extra characters used to delimit the environment
+    // variable ('%').
+    path.Replace((cursor - 1), temp - cursor + 2, nsDependentCString(buf));
+
+    ++cursor;
+  }
+  while (cursor < end);
+
+  STARTUPINFO si;
+  PROCESS_INFORMATION pi;
+
+  ::ZeroMemory(&si, sizeof(STARTUPINFO));
+  ::ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
+
+  char* pathCStr = ToNewCString(path);
+  BOOL success = ::CreateProcess(NULL, pathCStr, NULL, NULL, FALSE, 0, NULL, 
+                                 NULL, &si, &pi);
+  nsCRT::free(pathCStr);
+  if (!success)
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::GetDesktopBackgroundColor(PRUint32* aColor)
+{
+  PRUint32 color = ::GetSysColor(COLOR_DESKTOP);
+  *aColor = (GetRValue(color) << 16) | (GetGValue(color) << 8) | GetBValue(color);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::SetDesktopBackgroundColor(PRUint32 aColor)
+{
+  int aParameters[2] = { COLOR_BACKGROUND, COLOR_DESKTOP };
+  BYTE r = (aColor >> 16);
+  BYTE g = (aColor << 16) >> 24;
+  BYTE b = (aColor << 24) >> 24;
+  COLORREF colors[2] = { RGB(r,g,b), RGB(r,g,b) };
+
+  ::SetSysColors(sizeof(aParameters) / sizeof(int), aParameters, colors);
+
+  char   subKey[] = "Control Panel\\Colors";
+  PRBool result = PR_FALSE;
+  DWORD  dwDisp = 0;
+  HKEY   key;
+  // Try to create/open a subkey under HKLM.
+  DWORD rc = ::RegCreateKeyEx(HKEY_CURRENT_USER, subKey, 0, NULL, 
+                              REG_OPTION_NON_VOLATILE, KEY_WRITE, NULL, &key,
+                              &dwDisp);
+  if (REG_SUCCEEDED(rc)) {
+    unsigned char rgb[12];
+    sprintf((char*)rgb, "%u %u %u\0", r, g, b);
+    ::RegSetValueEx(key, "Background", 0, REG_SZ, (const unsigned char*)rgb, strlen((char*)rgb));
+  }
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsWindowsShellService::GetUnreadMailCount(PRUint32* aCount)
+{
+  *aCount = 0;
+
+  HKEY accountKey;
+  if (GetMailAccountKey(&accountKey)) {
+    DWORD type, unreadCount;
+    DWORD len = sizeof unreadCount;
+    DWORD result = ::RegQueryValueEx(accountKey, "MessageCount", 0, &type, 
+                                     (LPBYTE)&unreadCount, &len);
+    if (REG_SUCCEEDED(result)) {
+      *aCount = unreadCount;
+    }
+  }
+
+  return NS_OK;
+}
+
+PRBool
+nsWindowsShellService::GetMailAccountKey(HKEY* aResult)
+{
+  HKEY mailKey;
+  DWORD result = ::RegOpenKeyEx(HKEY_CURRENT_USER, 
+                                "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\UnreadMail\\",
+                                0, KEY_ENUMERATE_SUB_KEYS, &mailKey);
+
+  PRInt32 i = 0;
+  do {
+    char subkeyName[MAX_BUF];
+    DWORD len = sizeof subkeyName;
+    result = ::RegEnumKeyEx(mailKey, i++, subkeyName, &len, 0, 0, 0, 0);
+    if (REG_SUCCEEDED(result)) {
+      HKEY accountKey;
+      result = ::RegOpenKeyEx(mailKey, subkeyName, 0, KEY_READ, &accountKey);
+      if (REG_SUCCEEDED(result)) {
+        *aResult = accountKey;
+        return PR_TRUE;
+      }
+    }
+    else
+      break;
+  }
+  while (1);
+
+  return PR_FALSE;
+}
+
diff --git a/browser/components/shell/src/nsWindowsShellService.h b/browser/components/shell/src/nsWindowsShellService.h
index e69de29bb2d..32fa506ba99 100644
--- a/browser/components/shell/src/nsWindowsShellService.h
+++ b/browser/components/shell/src/nsWindowsShellService.h
@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK *****
+ * 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 Shell Service.
+ *
+ * The Initial Developer of the Original Code is mozilla.org.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *  Ben Goodger    <ben@mozilla.org>
+ *  Aaron Kaluszka <ask@swva.net>
+ *
+ * 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 ***** */
+
+#ifndef nswindowsshellservice_h____
+#define nswindowsshellservice_h____
+
+#include "nscore.h"
+#include "nsIWindowsShellService.h"
+
+#include <windows.h>
+
+class nsWindowsShellService : public nsIWindowsShellService 
+{
+public:
+  nsWindowsShellService() : mCheckedThisSession(PR_FALSE) {};
+  virtual ~nsWindowsShellService() {};
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISHELLSERVICE
+  NS_DECL_NSIWINDOWSSHELLSERVICE
+
+protected:
+  PRBool    GetMailAccountKey(HKEY* aResult);
+  void      SetRegKey(const char* aKeyName, const char* aValueName, 
+                      const char* aValue, PRBool aBackup, HKEY aBackupKey,
+                      PRBool aReplaceExisting);
+
+private:
+  PRBool    mCheckedThisSession;
+};
+
+#endif // nswindowsshellservice_h____