960 + flex="1" contenttooltip="aHTMLTooltip" |
959 + flex="1" contenttooltip="aHTMLTooltip" |
961 + tabcontainer="tabbrowser-tabs" |
960 + tabcontainer="tabbrowser-tabs" |
962 + contentcontextmenu="contentAreaContextMenu" |
961 + contentcontextmenu="contentAreaContextMenu" |
963 + autocompletepopup="PopupAutoComplete" |
962 + autocompletepopup="PopupAutoComplete" |
964 + onclick="return contentAreaClick(event, false);"/> |
963 + onclick="return contentAreaClick(event, false);"/> |
965 + <statuspanel id="statusbar-display" label=""/> |
964 + <statuspanel id="statusbar-display" inactive="true"/> |
966 + </vbox> |
965 + </vbox> |
967 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
966 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
968 + </hbox> |
967 + </hbox> |
969 + |
968 + |
970 + <vbox id="browser-bottombox" layer="true"> |
969 + <vbox id="browser-bottombox" layer="true"> |
1073 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1072 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1074 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1073 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1075 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1074 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1076 * content/browser/content.js (content/content.js) |
1075 * content/browser/content.js (content/content.js) |
1077 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1076 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
1078 * content/browser/inspector.html (content/inspector.html) |
|
1079 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1077 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1080 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1078 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1081 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1079 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1082 * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
1080 * content/browser/pageinfo/pageInfo.xml (content/pageinfo/pageInfo.xml) |
|
1081 * content/browser/pageinfo/feeds.js (content/pageinfo/feeds.js) |
1083 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1082 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1084 --- a/browser/components/build/nsModule.cpp |
1083 --- a/browser/components/build/nsModule.cpp |
1085 +++ b/browser/components/build/nsModule.cpp |
1084 +++ b/browser/components/build/nsModule.cpp |
1086 @@ -41,17 +41,17 @@ |
1085 @@ -41,17 +41,17 @@ |
1087 #include "nsBrowserCompsCID.h" |
1086 #include "nsBrowserCompsCID.h" |
1098 |
1097 |
1099 #include "nsProfileMigrator.h" |
1098 #include "nsProfileMigrator.h" |
1100 #if !defined(XP_OS2) |
1099 #if !defined(XP_OS2) |
1101 #include "nsOperaProfileMigrator.h" |
1100 #include "nsOperaProfileMigrator.h" |
1102 #endif |
1101 #endif |
1103 #include "nsSeamonkeyProfileMigrator.h" |
|
1104 #if defined(XP_WIN) && !defined(__MINGW32__) |
1102 #if defined(XP_WIN) && !defined(__MINGW32__) |
1105 @@ -72,18 +72,16 @@ using namespace mozilla::browser; |
1103 #include "nsIEProfileMigrator.h" |
|
1104 @@ -71,18 +71,16 @@ using namespace mozilla::browser; |
1106 |
1105 |
1107 ///////////////////////////////////////////////////////////////////////////// |
1106 ///////////////////////////////////////////////////////////////////////////// |
1108 |
1107 |
1109 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1108 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1110 #if defined(XP_WIN) |
1109 #if defined(XP_WIN) |
1117 |
1116 |
1118 #if !defined(XP_OS2) |
1117 #if !defined(XP_OS2) |
1119 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) |
1118 NS_GENERIC_FACTORY_CONSTRUCTOR(nsOperaProfileMigrator) |
1120 #endif |
1119 #endif |
1121 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) |
1120 NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfileMigrator) |
1122 NS_GENERIC_FACTORY_CONSTRUCTOR(nsSeamonkeyProfileMigrator) |
|
1123 #if defined(XP_WIN) && !defined(__MINGW32__) |
1121 #if defined(XP_WIN) && !defined(__MINGW32__) |
1124 @@ -117,17 +115,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA |
1122 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) |
1125 NS_DEFINE_NAMED_CID(NS_SEAMONKEYPROFILEMIGRATOR_CID); |
1123 @@ -114,17 +112,17 @@ NS_DEFINE_NAMED_CID(NS_OPERAPROFILEMIGRA |
|
1124 #endif |
1126 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1125 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1127 |
1126 |
1128 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1127 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1129 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1128 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1130 #if defined(XP_WIN) |
1129 #if defined(XP_WIN) |
1580 + |
1579 + |
1581 +#endif // nsunixshellservice_h____ |
1580 +#endif // nsunixshellservice_h____ |
1582 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1581 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1583 --- a/browser/installer/package-manifest.in |
1582 --- a/browser/installer/package-manifest.in |
1584 +++ b/browser/installer/package-manifest.in |
1583 +++ b/browser/installer/package-manifest.in |
1585 @@ -434,16 +434,17 @@ |
1584 @@ -424,16 +424,17 @@ |
1586 #endif |
1585 #endif |
1587 #endif |
1586 #endif |
1588 |
1587 |
1589 ; [Default Preferences] |
1588 ; [Default Preferences] |
1590 ; All the pref files must be part of base to prevent migration bugs |
1589 ; All the pref files must be part of base to prevent migration bugs |