1143 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1143 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1144 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1144 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1145 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1145 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1146 * content/browser/content.js (content/content.js) |
1146 * content/browser/content.js (content/content.js) |
1147 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1147 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
|
1148 * content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
|
1149 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
|
1150 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1148 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1151 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1149 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1152 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1150 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
|
1151 * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
|
1152 * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) |
|
1153 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1153 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1154 --- a/browser/components/build/nsModule.cpp |
1154 --- a/browser/components/build/nsModule.cpp |
1155 +++ b/browser/components/build/nsModule.cpp |
1155 +++ b/browser/components/build/nsModule.cpp |
1156 @@ -41,17 +41,17 @@ |
1156 @@ -41,17 +41,17 @@ |
1157 #include "nsBrowserCompsCID.h" |
1157 #include "nsBrowserCompsCID.h" |
1164 #elif defined(MOZ_WIDGET_GTK2) |
1164 #elif defined(MOZ_WIDGET_GTK2) |
1165 -#include "nsGNOMEShellService.h" |
1165 -#include "nsGNOMEShellService.h" |
1166 +#include "nsUnixShellService.h" |
1166 +#include "nsUnixShellService.h" |
1167 #endif |
1167 #endif |
1168 |
1168 |
1169 #include "nsProfileMigrator.h" |
|
1170 #if defined(XP_WIN) && !defined(__MINGW32__) |
1169 #if defined(XP_WIN) && !defined(__MINGW32__) |
1171 #include "nsIEProfileMigrator.h" |
1170 #include "nsIEProfileMigrator.h" |
1172 #elif defined(XP_MACOSX) |
1171 #elif defined(XP_MACOSX) |
1173 #include "nsSafariProfileMigrator.h" |
1172 #include "nsSafariProfileMigrator.h" |
1174 #endif |
1173 #endif |
1175 @@ -68,18 +68,16 @@ using namespace mozilla::browser; |
1174 |
|
1175 @@ -67,18 +67,16 @@ using namespace mozilla::browser; |
1176 |
1176 |
1177 ///////////////////////////////////////////////////////////////////////////// |
1177 ///////////////////////////////////////////////////////////////////////////// |
1178 |
1178 |
1179 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1179 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1180 #if defined(XP_WIN) |
1180 #if defined(XP_WIN) |
1183 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1183 NS_GENERIC_FACTORY_CONSTRUCTOR(nsMacShellService) |
1184 -#elif defined(MOZ_WIDGET_GTK2) |
1184 -#elif defined(MOZ_WIDGET_GTK2) |
1185 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1185 -NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsGNOMEShellService, Init) |
1186 #endif |
1186 #endif |
1187 |
1187 |
1188 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) |
|
1189 #if defined(XP_WIN) && !defined(__MINGW32__) |
1188 #if defined(XP_WIN) && !defined(__MINGW32__) |
1190 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) |
1189 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) |
1191 #elif defined(XP_MACOSX) |
1190 #elif defined(XP_MACOSX) |
1192 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator) |
1191 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator) |
1193 #endif |
1192 #endif |
1194 @@ -105,17 +103,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR |
1193 |
|
1194 @@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR |
1195 #endif |
1195 #endif |
1196 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1196 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1197 |
1197 |
1198 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1198 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1199 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1199 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1203 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
1203 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
1204 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1204 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1205 #endif |
1205 #endif |
1206 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1206 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1207 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1207 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1208 { &kNS_FIREFOX_PROFILEMIGRATOR_CID, false, NULL, nsProfileMigratorConstructor }, |
|
1209 #if defined(XP_WIN) && !defined(__MINGW32__) |
1208 #if defined(XP_WIN) && !defined(__MINGW32__) |
1210 { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, |
1209 { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, |
1211 #elif defined(XP_MACOSX) |
1210 #elif defined(XP_MACOSX) |
1212 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1211 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
|
1212 { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor }, |
1213 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1213 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1214 --- a/browser/components/preferences/advanced.js |
1214 --- a/browser/components/preferences/advanced.js |
1215 +++ b/browser/components/preferences/advanced.js |
1215 +++ b/browser/components/preferences/advanced.js |
1216 @@ -697,24 +697,42 @@ var gAdvancedPane = { |
1216 @@ -716,24 +716,42 @@ var gAdvancedPane = { |
1217 var brandBundle = document.getElementById("bundleBrand"); |
1217 var brandBundle = document.getElementById("bundleBrand"); |
1218 var shellBundle = document.getElementById("bundleShell"); |
1218 var shellBundle = document.getElementById("bundleShell"); |
1219 var brandShortName = brandBundle.getString("brandShortName"); |
1219 var brandShortName = brandBundle.getString("brandShortName"); |
1220 var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); |
1220 var promptTitle = shellBundle.getString("setDefaultBrowserTitle"); |
1221 var promptMessage; |
1221 var promptMessage; |
1714 + |
1714 + |
1715 +#endif // nsunixshellservice_h____ |
1715 +#endif // nsunixshellservice_h____ |
1716 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1716 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1717 --- a/browser/installer/package-manifest.in |
1717 --- a/browser/installer/package-manifest.in |
1718 +++ b/browser/installer/package-manifest.in |
1718 +++ b/browser/installer/package-manifest.in |
1719 @@ -440,16 +440,17 @@ |
1719 @@ -449,16 +449,17 @@ |
1720 #endif |
1720 #endif |
1721 #endif |
1721 #endif |
1722 |
1722 |
1723 ; [Default Preferences] |
1723 ; [Default Preferences] |
1724 ; All the pref files must be part of base to prevent migration bugs |
1724 ; All the pref files must be part of base to prevent migration bugs |