126 + <!-- for search and content formfill/pw manager --> |
126 + <!-- for search and content formfill/pw manager --> |
127 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
127 + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> |
128 + |
128 + |
129 + <!-- for url bar autocomplete --> |
129 + <!-- for url bar autocomplete --> |
130 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
130 + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> |
|
131 + |
|
132 + <!-- for select dropdowns --> |
|
133 + <menupopup id="ContentSelectDropdown" rolluponmousewheel="true" hidden="true"/> |
131 + |
134 + |
132 + <!-- for invalid form error message --> |
135 + <!-- for invalid form error message --> |
133 + <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
136 + <panel id="invalid-form-popup" type="arrow" orient="vertical" noautofocus="true" hidden="true" level="parent"> |
134 + <description/> |
137 + <description/> |
135 + </panel> |
138 + </panel> |
507 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
510 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
508 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
511 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
509 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
512 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
510 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
513 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
511 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
514 + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> |
512 + <image id="alert-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
|
513 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
|
514 + <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> |
515 + <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> |
515 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
516 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
516 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
517 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
517 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
518 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
518 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
519 + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> |
743 + <menuitem label="&social.learnMore.label;" |
744 + <menuitem label="&social.learnMore.label;" |
744 + accesskey="&social.learnMore.accesskey;" |
745 + accesskey="&social.learnMore.accesskey;" |
745 + oncommand="SocialUI.showLearnMore();"/> |
746 + oncommand="SocialUI.showLearnMore();"/> |
746 + </menupopup> |
747 + </menupopup> |
747 + </toolbarbutton> |
748 + </toolbarbutton> |
748 + <toolbarbutton id="social-mark-button" |
|
749 + class="toolbarbutton-1" |
|
750 + hidden="true" |
|
751 + disabled="true" |
|
752 + command="Social:TogglePageMark"/> |
|
753 + </toolbaritem> |
749 + </toolbaritem> |
754 + |
750 + |
755 + <hbox id="window-controls" hidden="true" pack="end"> |
751 + <hbox id="window-controls" hidden="true" pack="end"> |
756 + <toolbarbutton id="minimize-button" |
752 + <toolbarbutton id="minimize-button" |
757 + tooltiptext="&fullScreenMinimize.tooltip;" |
753 + tooltiptext="&fullScreenMinimize.tooltip;" |
1027 + <vbox id="appcontent" flex="1"> |
1023 + <vbox id="appcontent" flex="1"> |
1028 + <tabbrowser id="content" disablehistory="true" |
1024 + <tabbrowser id="content" disablehistory="true" |
1029 + flex="1" contenttooltip="aHTMLTooltip" |
1025 + flex="1" contenttooltip="aHTMLTooltip" |
1030 + tabcontainer="tabbrowser-tabs" |
1026 + tabcontainer="tabbrowser-tabs" |
1031 + contentcontextmenu="contentAreaContextMenu" |
1027 + contentcontextmenu="contentAreaContextMenu" |
1032 + autocompletepopup="PopupAutoComplete"/> |
1028 + autocompletepopup="PopupAutoComplete" |
|
1029 + selectpopup="ContentSelectDropdown"/> |
1033 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1030 + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> |
1034 + </vbox> |
1031 + </vbox> |
1035 + <splitter id="social-sidebar-splitter" |
1032 + <splitter id="social-sidebar-splitter" |
1036 + class="chromeclass-extrachrome sidebar-splitter" |
1033 + class="chromeclass-extrachrome sidebar-splitter" |
1037 + observes="socialSidebarBroadcaster"/> |
1034 + observes="socialSidebarBroadcaster"/> |
1165 + |
1162 + |
1166 +</window> |
1163 +</window> |
1167 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1164 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1168 --- a/browser/base/jar.mn |
1165 --- a/browser/base/jar.mn |
1169 +++ b/browser/base/jar.mn |
1166 +++ b/browser/base/jar.mn |
1170 @@ -52,16 +52,18 @@ browser.jar: |
1167 @@ -53,16 +53,18 @@ browser.jar: |
1171 content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) |
|
1172 #endif |
1168 #endif |
1173 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1169 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1174 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1170 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1175 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1171 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
|
1172 content/browser/aboutTabCrashed.xhtml (content/aboutTabCrashed.xhtml) |
1176 * content/browser/browser.css (content/browser.css) |
1173 * content/browser/browser.css (content/browser.css) |
1177 * content/browser/browser.js (content/browser.js) |
1174 * content/browser/browser.js (content/browser.js) |
1178 * content/browser/browser.xul (content/browser.xul) |
1175 * content/browser/browser.xul (content/browser.xul) |
1179 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1176 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1180 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1177 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1230 @@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME |
1227 @@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME |
1231 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); |
1228 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); |
1232 #endif |
1229 #endif |
1233 |
1230 |
1234 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1231 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1235 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1232 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, |
1236 #if defined(XP_WIN) |
1233 #if defined(XP_WIN) |
1237 { &kNS_SHELLSERVICE_CID, false, NULL, nsWindowsShellServiceConstructor }, |
1234 { &kNS_SHELLSERVICE_CID, false, nullptr, nsWindowsShellServiceConstructor }, |
1238 #elif defined(MOZ_WIDGET_GTK) |
1235 #elif defined(MOZ_WIDGET_GTK) |
1239 - { &kNS_SHELLSERVICE_CID, false, NULL, nsGNOMEShellServiceConstructor }, |
1236 - { &kNS_SHELLSERVICE_CID, false, nullptr, nsGNOMEShellServiceConstructor }, |
1240 + { &kNS_SHELLSERVICE_CID, false, NULL, nsUnixShellServiceConstructor }, |
1237 + { &kNS_SHELLSERVICE_CID, false, nullptr, nsUnixShellServiceConstructor }, |
1241 #endif |
1238 #endif |
1242 { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, |
1239 { &kNS_FEEDSNIFFER_CID, false, nullptr, nsFeedSnifferConstructor }, |
1243 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, |
1240 { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create }, |
1244 #if defined(XP_WIN) |
1241 #if defined(XP_WIN) |
1245 { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor }, |
1242 { &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor }, |
1246 #elif defined(XP_MACOSX) |
1243 #elif defined(XP_MACOSX) |
1247 { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, |
1244 { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, |
1248 #endif |
1245 #endif |
1249 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1246 diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js |
1250 --- a/browser/components/preferences/advanced.js |
1247 --- a/browser/components/preferences/advanced.js |
1251 +++ b/browser/components/preferences/advanced.js |
1248 +++ b/browser/components/preferences/advanced.js |
1252 @@ -23,16 +23,22 @@ var gAdvancedPane = { |
1249 @@ -23,16 +23,22 @@ var gAdvancedPane = { |
1299 #endif |
1296 #endif |
1300 }; |
1297 }; |
1301 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1298 diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in |
1302 --- a/browser/components/shell/src/Makefile.in |
1299 --- a/browser/components/shell/src/Makefile.in |
1303 +++ b/browser/components/shell/src/Makefile.in |
1300 +++ b/browser/components/shell/src/Makefile.in |
1304 @@ -16,10 +16,12 @@ USE_STATIC_LIBS = 1 |
1301 @@ -9,10 +9,12 @@ USE_STATIC_LIBS = 1 |
1305 |
1302 |
1306 include $(topsrcdir)/config/rules.mk |
1303 include $(topsrcdir)/config/rules.mk |
1307 |
1304 |
1308 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \ |
1305 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\" \ |
1309 -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" |
1306 -DMOZ_APP_VERSION=\"$(MOZ_APP_VERSION)\" |
1748 + |
1745 + |
1749 +#endif // nsunixshellservice_h____ |
1746 +#endif // nsunixshellservice_h____ |
1750 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1747 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1751 --- a/browser/installer/package-manifest.in |
1748 --- a/browser/installer/package-manifest.in |
1752 +++ b/browser/installer/package-manifest.in |
1749 +++ b/browser/installer/package-manifest.in |
1753 @@ -606,19 +606,21 @@ |
1750 @@ -593,19 +593,21 @@ |
1754 @BINPATH@/defaults/autoconfig/prefcalls.js |
1751 @BINPATH@/defaults/autoconfig/prefcalls.js |
1755 @BINPATH@/browser/defaults/profile/prefs.js |
1752 @BINPATH@/browser/defaults/profile/prefs.js |
1756 |
1753 |
1757 #ifndef LIBXUL_SDK |
1754 #ifndef LIBXUL_SDK |
1758 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1755 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |