equal
deleted
inserted
replaced
1140 #endif |
1140 #endif |
1141 |
1141 |
1142 #ifndef WINCE |
1142 #ifndef WINCE |
1143 |
1143 |
1144 #include "nsProfileMigrator.h" |
1144 #include "nsProfileMigrator.h" |
1145 #if !defined(XP_BEOS) |
|
1146 #include "nsDogbertProfileMigrator.h" |
1145 #include "nsDogbertProfileMigrator.h" |
1147 #endif |
1146 #if !defined(XP_OS2) |
1148 @@ -84,18 +84,16 @@ using namespace mozilla::browser; |
1147 #include "nsOperaProfileMigrator.h" |
|
1148 @@ -82,18 +82,16 @@ using namespace mozilla::browser; |
1149 |
1149 |
1150 ///////////////////////////////////////////////////////////////////////////// |
1150 ///////////////////////////////////////////////////////////////////////////// |
1151 |
1151 |
1152 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1152 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1153 #if defined(XP_WIN) |
1153 #if defined(XP_WIN) |
1158 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1158 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1159 #endif |
1159 #endif |
1160 |
1160 |
1161 #ifndef WINCE |
1161 #ifndef WINCE |
1162 |
1162 |
1163 #if !defined(XP_BEOS) |
|
1164 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
1163 NS_GENERIC_FACTORY_CONSTRUCTOR(nsDogbertProfileMigrator) |
|
1164 #if !defined(XP_OS2) |
|
1165 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) |
1165 #endif |
1166 #endif |
1166 #if !defined(XP_OS2) |
1167 @@ -145,17 +143,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM |
1167 @@ -151,17 +149,17 @@ NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEM |
|
1168 #endif /* WINCE */ |
1168 #endif /* WINCE */ |
1169 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1169 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1170 |
1170 |
1171 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1171 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1172 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1172 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1623 + |
1623 + |
1624 +#endif // nsunixshellservice_h____ |
1624 +#endif // nsunixshellservice_h____ |
1625 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1625 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1626 --- a/browser/installer/package-manifest.in |
1626 --- a/browser/installer/package-manifest.in |
1627 +++ b/browser/installer/package-manifest.in |
1627 +++ b/browser/installer/package-manifest.in |
1628 @@ -442,16 +442,17 @@ |
1628 @@ -441,16 +441,17 @@ |
1629 #endif |
1629 #endif |
1630 #endif |
1630 #endif |
1631 |
1631 |
1632 ; [Default Preferences] |
1632 ; [Default Preferences] |
1633 ; All the pref files must be part of base to prevent migration bugs |
1633 ; All the pref files must be part of base to prevent migration bugs |