187 + hidden="true" |
187 + hidden="true" |
188 + consumeoutsideclicks="true" |
188 + consumeoutsideclicks="true" |
189 + align="start" |
189 + align="start" |
190 + role="alert"> |
190 + role="alert"> |
191 + <hbox flex="1"> |
191 + <hbox flex="1"> |
192 + <image src="chrome://browser/content/social-icon.png" class="popup-notification-icon"/> |
192 + <image id="social-activation-icon" class="popup-notification-icon"/> |
193 + <vbox flex="1"> |
193 + <vbox flex="1"> |
194 + <description id="social-activation-message" class="popup-notification-description"/> |
194 + <description id="social-activation-message" class="popup-notification-description"/> |
195 + <spacer flex="1"/> |
195 + <spacer flex="1"/> |
196 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
196 + <hbox pack="end" align="center" class="popup-notification-button-container"> |
197 +#ifndef XP_UNIX |
197 +#ifndef XP_UNIX |
268 + |
268 + |
269 + <panel id="social-notification-panel" |
269 + <panel id="social-notification-panel" |
270 + class="social-panel" |
270 + class="social-panel" |
271 + type="arrow" |
271 + type="arrow" |
272 + hidden="true" |
272 + hidden="true" |
273 + consumeoutsideclicks="true" |
|
274 + noautofocus="true"/> |
273 + noautofocus="true"/> |
275 + <panel id="social-flyout-panel" |
274 + <panel id="social-flyout-panel" |
276 + class="social-panel" |
275 + class="social-panel" |
277 + onpopupshown="SocialFlyout.onShown()" |
276 + onpopupshown="SocialFlyout.onShown()" |
278 + onpopuphidden="SocialFlyout.onHidden()" |
277 + onpopuphidden="SocialFlyout.onHidden()" |
279 + side="right" |
278 + side="right" |
280 + type="arrow" |
279 + type="arrow" |
281 + hidden="true" |
280 + hidden="true" |
|
281 + rolluponmousewheel="true" |
|
282 + consumeoutsideclicks="false" |
282 + noautofocus="true" |
283 + noautofocus="true" |
283 + position="topcenter topright"/> |
284 + position="topcenter topright"/> |
284 + |
285 + |
285 + <menupopup id="toolbar-context-menu" |
286 + <menupopup id="toolbar-context-menu" |
286 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
287 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
315 + </menupopup> |
316 + </menupopup> |
316 + |
317 + |
317 + <menupopup id="contentAreaContextMenu" pagemenu="start" |
318 + <menupopup id="contentAreaContextMenu" pagemenu="start" |
318 + onpopupshowing="if (event.target != this) |
319 + onpopupshowing="if (event.target != this) |
319 + return true; |
320 + return true; |
320 + gContextMenu = new nsContextMenu(this, gBrowser, event.shiftKey); |
321 + gContextMenu = new nsContextMenu(this, event.shiftKey); |
321 + if (gContextMenu.shouldDisplay) |
322 + if (gContextMenu.shouldDisplay) |
322 + updateEditUIVisibility(); |
323 + updateEditUIVisibility(); |
323 + return gContextMenu.shouldDisplay;" |
324 + return gContextMenu.shouldDisplay;" |
324 + onpopuphiding="if (event.target != this) |
325 + onpopuphiding="if (event.target != this) |
325 + return; |
326 + return; |
397 + <hbox pack="center"> |
398 + <hbox pack="center"> |
398 + <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/> |
399 + <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/> |
399 + </hbox> |
400 + </hbox> |
400 + </panel> |
401 + </panel> |
401 + |
402 + |
402 + <panel id="allTabs-panel" hidden="true" norestorefocus="true" ignorekeys="true" |
|
403 + onmouseover="allTabs._updateTabCloseButton(event);"> |
|
404 + <hbox id="allTabs-meta" align="center"> |
|
405 + <spacer flex="1"/> |
|
406 + <textbox id="allTabs-filter" |
|
407 + tooltiptext="&allTabs.filter.emptyText;" |
|
408 + type="search" |
|
409 + oncommand="allTabs.filter();"/> |
|
410 + <spacer flex="1"/> |
|
411 + <toolbarbutton class="KUI-panel-closebutton" |
|
412 + oncommand="allTabs.close()" |
|
413 + tooltiptext="&closeCmd.label;"/> |
|
414 + </hbox> |
|
415 + <stack id="allTabs-stack"> |
|
416 + <vbox id="allTabs-container"><hbox/></vbox> |
|
417 + <toolbarbutton id="allTabs-tab-close-button" |
|
418 + class="tabs-closebutton" |
|
419 + oncommand="allTabs.closeTab(event);" |
|
420 + tooltiptext="&closeCmd.label;" |
|
421 + style="visibility:hidden"/> |
|
422 + </stack> |
|
423 + </panel> |
|
424 + |
|
425 + <!-- Bookmarks and history tooltip --> |
403 + <!-- Bookmarks and history tooltip --> |
426 + <tooltip id="bhTooltip"/> |
404 + <tooltip id="bhTooltip"/> |
427 + |
405 + |
428 + <panel id="customizeToolbarSheetPopup" |
406 + <panel id="customizeToolbarSheetPopup" |
429 + noautohide="true" |
407 + noautohide="true" |
474 + <popupnotificationcontent orient="vertical" align="start"> |
452 + <popupnotificationcontent orient="vertical" align="start"> |
475 + <separator class="thin"/> |
453 + <separator class="thin"/> |
476 + <label id="geolocation-learnmore-link" class="text-link"/> |
454 + <label id="geolocation-learnmore-link" class="text-link"/> |
477 + </popupnotificationcontent> |
455 + </popupnotificationcontent> |
478 + </popupnotification> |
456 + </popupnotification> |
|
457 + |
|
458 + <popupnotification id="mixed-content-blocked-notification" hidden="true"> |
|
459 + <popupnotificationcontent orient="vertical" align="start"> |
|
460 + <separator/> |
|
461 + <description id="mixed-content-blocked-moreinfo">&mixedContentBlocked.moreinfo;</description> |
|
462 + <separator/> |
|
463 + <label id="mixed-content-blocked-helplink" class="text-link" |
|
464 + value="&mixedContentBlocked.helplink;"/> |
|
465 + </popupnotificationcontent> |
|
466 + </popupnotification> |
|
467 + |
479 + </popupset> |
468 + </popupset> |
480 + |
469 + |
481 +#ifdef CAN_DRAW_IN_TITLEBAR |
470 +#ifdef CAN_DRAW_IN_TITLEBAR |
482 +<vbox id="titlebar"> |
471 +<vbox id="titlebar"> |
483 + <hbox id="titlebar-content"> |
472 + <hbox id="titlebar-content"> |
|
473 +#ifdef MENUBAR_CAN_AUTOHIDE |
484 + <hbox id="appmenu-button-container"> |
474 + <hbox id="appmenu-button-container"> |
485 + <button id="appmenu-button" |
475 + <button id="appmenu-button" |
486 + type="menu" |
476 + type="menu" |
487 + label="&brandShortName;" |
477 + label="&brandShortName;" |
488 + style="-moz-user-focus: ignore;"> |
478 + style="-moz-user-focus: ignore;"> |
489 +#include browser-appmenu.inc |
479 +#include browser-appmenu.inc |
490 + </button> |
480 + </button> |
491 + </hbox> |
481 + </hbox> |
|
482 +#endif |
492 + <spacer id="titlebar-spacer" flex="1"/> |
483 + <spacer id="titlebar-spacer" flex="1"/> |
493 + <hbox id="titlebar-buttonbox-container" align="start"> |
484 + <hbox id="titlebar-buttonbox-container" align="start"> |
494 + <hbox id="titlebar-buttonbox"> |
485 + <hbox id="titlebar-buttonbox"> |
495 + <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
486 + <toolbarbutton class="titlebar-button" id="titlebar-min" oncommand="window.minimize();"/> |
496 + <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
487 + <toolbarbutton class="titlebar-button" id="titlebar-max" oncommand="onTitlebarMaxClick();"/> |
560 + </toolbaritem> |
551 + </toolbaritem> |
561 + |
552 + |
562 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
553 + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" |
563 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
554 + title="&locationItem.title;" class="chromeclass-location" removable="true"> |
564 + <textbox id="urlbar" flex="1" |
555 + <textbox id="urlbar" flex="1" |
565 + placeholder="&urlbar.placeholder;" |
556 + placeholder="&urlbar.placeholder2;" |
566 + type="autocomplete" |
557 + type="autocomplete" |
567 + autocompletesearch="urlinline history" |
558 + autocompletesearch="urlinline history" |
568 + autocompletesearchparam="enable-actions" |
559 + autocompletesearchparam="enable-actions" |
569 + autocompletepopup="PopupAutoCompleteRichResult" |
560 + autocompletepopup="PopupAutoCompleteRichResult" |
570 + completeselectedindex="true" |
561 + completeselectedindex="true" |
588 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
579 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
589 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
580 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
590 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
581 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
591 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
582 + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
592 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
583 + <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/> |
|
584 + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> |
593 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
585 + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
594 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
586 + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> |
595 + </box> |
587 + </box> |
596 + <!-- Use onclick instead of normal popup= syntax since the popup |
588 + <!-- Use onclick instead of normal popup= syntax since the popup |
597 + code fires onmousedown, and hence eats our favicon drag events. |
589 + code fires onmousedown, and hence eats our favicon drag events. |
1108 + class="chromeclass-extrachrome" |
1100 + class="chromeclass-extrachrome" |
1109 + observes="socialSidebarBroadcaster" |
1101 + observes="socialSidebarBroadcaster" |
1110 + persist="width"> |
1102 + persist="width"> |
1111 + <browser id="social-sidebar-browser" |
1103 + <browser id="social-sidebar-browser" |
1112 + type="content" |
1104 + type="content" |
|
1105 + context="contentAreaContextMenu" |
1113 + disableglobalhistory="true" |
1106 + disableglobalhistory="true" |
1114 + flex="1" |
1107 + flex="1" |
1115 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1108 + style="min-width: 14em; width: 18em; max-width: 36em;"/> |
1116 + </vbox> |
1109 + </vbox> |
1117 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1110 + <vbox id="browser-border-end" hidden="true" layer="true"/> |
1266 #include "nsIEHistoryEnumerator.h" |
1260 #include "nsIEHistoryEnumerator.h" |
1267 #endif |
1261 #endif |
1268 |
1262 |
1269 #include "rdf.h" |
1263 #include "rdf.h" |
1270 #include "nsFeedSniffer.h" |
1264 #include "nsFeedSniffer.h" |
1271 @@ -34,18 +34,16 @@ using namespace mozilla::browser; |
1265 @@ -31,18 +31,16 @@ using namespace mozilla::browser; |
1272 |
1266 |
1273 ///////////////////////////////////////////////////////////////////////////// |
1267 ///////////////////////////////////////////////////////////////////////////// |
1274 |
1268 |
1275 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1269 NS_GENERIC_FACTORY_CONSTRUCTOR(DirectoryProvider) |
1276 #if defined(XP_WIN) |
1270 #if defined(XP_WIN) |
1285 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1279 NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) |
1286 #endif |
1280 #endif |
1287 |
1281 |
1288 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1282 NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) |
1289 |
1283 |
1290 @@ -70,17 +68,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) |
1284 @@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME |
1291 NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); |
1285 NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); |
1292 #endif |
1286 #endif |
1293 |
1287 |
1294 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1288 static const mozilla::Module::CIDEntry kBrowserCIDs[] = { |
1295 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1289 { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, NULL, DirectoryProviderConstructor }, |
1296 #if defined(XP_WIN) |
1290 #if defined(XP_WIN) |
1330 // In Windows 8 we launch the control panel since it's the only |
1324 // In Windows 8 we launch the control panel since it's the only |
1331 // way to get all file type association prefs. So we don't know |
1325 // way to get all file type association prefs. So we don't know |
1332 // when the user will select the default. We refresh here periodically |
1326 // when the user will select the default. We refresh here periodically |
1333 // in case the default changes. On other Windows OS's defaults can also |
1327 // in case the default changes. On other Windows OS's defaults can also |
1334 // be set while the prefs are open. |
1328 // be set while the prefs are open. |
1335 @@ -791,14 +797,25 @@ var gAdvancedPane = { |
1329 @@ -792,14 +798,25 @@ var gAdvancedPane = { |
1336 * Set browser as the operating system default browser. |
1330 * Set browser as the operating system default browser. |
1337 */ |
1331 */ |
1338 setDefaultBrowser: function() |
1332 setDefaultBrowser: function() |
1339 { |
1333 { |
1340 let shellSvc = getShellService(); |
1334 let shellSvc = getShellService(); |
1792 + |
1786 + |
1793 +#endif // nsunixshellservice_h____ |
1787 +#endif // nsunixshellservice_h____ |
1794 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1788 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1795 --- a/browser/installer/package-manifest.in |
1789 --- a/browser/installer/package-manifest.in |
1796 +++ b/browser/installer/package-manifest.in |
1790 +++ b/browser/installer/package-manifest.in |
1797 @@ -578,19 +578,21 @@ |
1791 @@ -588,19 +588,21 @@ |
1798 @BINPATH@/defaults/autoconfig/prefcalls.js |
1792 @BINPATH@/defaults/autoconfig/prefcalls.js |
1799 @BINPATH@/defaults/profile/prefs.js |
1793 @BINPATH@/browser/defaults/profile/prefs.js |
1800 |
1794 |
1801 #ifndef LIBXUL_SDK |
1795 #ifndef LIBXUL_SDK |
1802 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1796 ; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325) |
1803 ; Technically this is an app pref file, but we are keeping it in the original |
1797 ; Technically this is an app pref file, but we are keeping it in the original |
1804 ; gre location for now. |
1798 ; gre location for now. |
1809 @BINPATH@/@PREF_DIR@/channel-prefs.js |
1803 @BINPATH@/@PREF_DIR@/channel-prefs.js |
1810 +@BINPATH@/@PREF_DIR@/kde.js |
1804 +@BINPATH@/@PREF_DIR@/kde.js |
1811 #endif |
1805 #endif |
1812 |
1806 |
1813 ; Services (gre) prefs |
1807 ; Services (gre) prefs |
1814 #ifdef MOZ_SERVICES_AITC |
|
1815 @BINPATH@/defaults/pref/services-aitc.js |
|
1816 #endif |
|
1817 #ifdef MOZ_SERVICES_NOTIFICATIONS |
1808 #ifdef MOZ_SERVICES_NOTIFICATIONS |
1818 @BINPATH@/defaults/pref/services-notifications.js |
1809 @BINPATH@/defaults/pref/services-notifications.js |
|
1810 #endif |
|
1811 #ifdef MOZ_SERVICES_SYNC |
|
1812 @BINPATH@/defaults/pref/services-sync.js |