1151 -#include "nsGNOMEShellService.h" |
1151 -#include "nsGNOMEShellService.h" |
1152 +#include "nsUnixShellService.h" |
1152 +#include "nsUnixShellService.h" |
1153 #endif |
1153 #endif |
1154 |
1154 |
1155 #include "nsProfileMigrator.h" |
1155 #include "nsProfileMigrator.h" |
1156 #if !defined(XP_OS2) |
|
1157 #include "nsOperaProfileMigrator.h" |
|
1158 #endif |
|
1159 #if defined(XP_WIN) && !defined(__MINGW32__) |
1156 #if defined(XP_WIN) && !defined(__MINGW32__) |
1160 #include "nsIEProfileMigrator.h" |
1157 #include "nsIEProfileMigrator.h" |
1161 @@ -71,18 +71,16 @@ using namespace mozilla::browser; |
1158 #elif defined(XP_MACOSX) |
|
1159 #include "nsSafariProfileMigrator.h" |
|
1160 #endif |
|
1161 @@ -68,18 +68,16 @@ using namespace mozilla::browser; |
1162 |
1162 |
1163 ///////////////////////////////////////////////////////////////////////////// |
1163 ///////////////////////////////////////////////////////////////////////////// |
1164 |
1164 |
1165 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1165 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1166 #if defined(XP_WIN) |
1166 #if defined(XP_WIN) |
1169 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1169 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1170 -#elif defined(MOZ_WIDGET_GTK2) |
1170 -#elif defined(MOZ_WIDGET_GTK2) |
1171 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1171 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1172 #endif |
1172 #endif |
1173 |
1173 |
1174 #if !defined(XP_OS2) |
|
1175 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) |
|
1176 #endif |
|
1177 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) |
1174 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) |
1178 #if defined(XP_WIN) && !defined(__MINGW32__) |
1175 #if defined(XP_WIN) && !defined(__MINGW32__) |
1179 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) |
1176 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) |
1180 @@ -114,17 +112,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA |
1177 #elif defined(XP_MACOSX) |
|
1178 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator) |
|
1179 #endif |
|
1180 @@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR |
1181 #endif |
1181 #endif |
1182 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1182 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1183 |
1183 |
1184 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1184 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1185 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1185 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1197 #elif defined(XP_MACOSX) |
1197 #elif defined(XP_MACOSX) |
1198 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1198 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1199 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1199 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1200 --- a/browser/components/preferences/advanced.js |
1200 --- a/browser/components/preferences/advanced.js |
1201 +++ b/browser/components/preferences/advanced.js |
1201 +++ b/browser/components/preferences/advanced.js |
1202 @@ -690,24 +690,42 @@ var gAdvancedPane = { |
1202 @@ -697,24 +697,42 @@ var gAdvancedPane = { |
1203 var brandBundle = document.getElementById("bundleBrand"); |
1203 var brandBundle = document.getElementById("bundleBrand"); |
1204 var shellBundle = document.getElementById("bundleShell"); |
1204 var shellBundle = document.getElementById("bundleShell"); |
1205 var brandShortName = brandBundle.getString("brandShortName"); |
1205 var brandShortName = brandBundle.getString("brandShortName"); |
1206 var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); |
1206 var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); |
1207 var promptMessage; |
1207 var promptMessage; |
1244 } |
1244 } |
1245 #endif |
1245 #endif |
1246 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1246 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1247 --- a/browser/components/shell/src/Makefile.in |
1247 --- a/browser/components/shell/src/Makefile.in |
1248 +++ b/browser/components/shell/src/Makefile.in |
1248 +++ b/browser/components/shell/src/Makefile.in |
1249 @@ -52,17 +52,18 @@ endif |
1249 @@ -51,17 +51,18 @@ endif |
1250 |
1250 |
1251 ifeq ($(OS_ARCH),WINNT) |
1251 ifeq ($(OS_ARCH),WINNT) |
1252 CPPSRCS = nsWindowsShellService.cpp |
1252 CPPSRCS = nsWindowsShellService.cpp |
1253 else |
1253 else |
1254 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
1254 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
1700 + |
1700 + |
1701 +#endif // nsunixshellservice_h____ |
1701 +#endif // nsunixshellservice_h____ |
1702 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1702 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1703 --- a/browser/installer/package-manifest.in |
1703 --- a/browser/installer/package-manifest.in |
1704 +++ b/browser/installer/package-manifest.in |
1704 +++ b/browser/installer/package-manifest.in |
1705 @@ -426,16 +426,17 @@ |
1705 @@ -440,16 +440,17 @@ |
1706 #endif |
1706 #endif |
1707 #endif |
1707 #endif |
1708 |
1708 |
1709 ; [Default Preferences] |
1709 ; [Default Preferences] |
1710 ; All the pref files must be part of base to prevent migration bugs |
1710 ; All the pref files must be part of base to prevent migration bugs |