41 +# Rob Campbell <rcampbell@mozilla.com> |
41 +# Rob Campbell <rcampbell@mozilla.com> |
42 +# Patrick Walton <pcwalton@mozilla.com> |
42 +# Patrick Walton <pcwalton@mozilla.com> |
43 +# David Dahl <ddahl@mozilla.com> |
43 +# David Dahl <ddahl@mozilla.com> |
44 +# Frank Yan <fyan@mozilla.com> |
44 +# Frank Yan <fyan@mozilla.com> |
45 +# Victor Porof <vporof@mozilla.com> |
45 +# Victor Porof <vporof@mozilla.com> |
|
46 +# Paul Rouget <paul@mozilla.com> |
46 +# |
47 +# |
47 +# Alternatively, the contents of this file may be used under the terms of |
48 +# Alternatively, the contents of this file may be used under the terms of |
48 +# either the GNU General Public License Version 2 or later (the "GPL"), or |
49 +# either the GNU General Public License Version 2 or later (the "GPL"), or |
49 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
50 +# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), |
50 +# in which case the provisions of the GPL or the LGPL are applicable instead |
51 +# in which case the provisions of the GPL or the LGPL are applicable instead |
93 +#endif |
94 +#endif |
94 + titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" |
95 + titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" |
95 + lightweightthemes="true" |
96 + lightweightthemes="true" |
96 + lightweightthemesfooter="browser-bottombox" |
97 + lightweightthemesfooter="browser-bottombox" |
97 + windowtype="navigator:browser" |
98 + windowtype="navigator:browser" |
|
99 + macanimationtype="document" |
98 + screenX="4" screenY="4" |
100 + screenX="4" screenY="4" |
99 + browsingmode="normal" |
101 + browsingmode="normal" |
100 + persist="screenX screenY width height sizemode"> |
102 + persist="screenX screenY width height sizemode"> |
101 + |
103 + |
102 +# All JS files which are not content (only) dependent that browser.xul |
104 +# All JS files which are not content (only) dependent that browser.xul |
229 + oncommand="StarUI.panel.hidePopup();"/> |
231 + oncommand="StarUI.panel.hidePopup();"/> |
230 +#endif |
232 +#endif |
231 + </hbox> |
233 + </hbox> |
232 + </panel> |
234 + </panel> |
233 + |
235 + |
234 + <panel id="inspector-tree-panel" |
236 + <menupopup id="inspector-node-popup"> |
235 + orient="vertical" |
237 + <menuitem id="inspectorHTMLCopyInner" |
236 + hidden="true" |
238 + label="&inspectorHTMLCopyInner.label;" |
237 + ignorekeys="true" |
239 + accesskey="&inspectorHTMLCopyInner.accesskey;" |
238 + noautofocus="true" |
240 + command="Inspector:CopyInner"/> |
239 + noautohide="true" |
241 + <menuitem id="inspectorHTMLCopyOuter" |
240 + titlebar="normal" |
242 + label="&inspectorHTMLCopyOuter.label;" |
241 + close="true" |
243 + accesskey="&inspectorHTMLCopyOuter.accesskey;" |
242 + label="&inspectPanelTitle.label;"> |
244 + command="Inspector:CopyOuter"/> |
243 + <hbox id="tree-panel-resizer-box" align="end"> |
245 + <menuseparator/> |
244 + <spacer flex="1" /> |
246 + <menuitem id="inspectorHTMLDelete" |
245 + <resizer dir="bottomend" /> |
247 + label="&inspectorHTMLDelete.label;" |
246 + </hbox> |
248 + accesskey="&inspectorHTMLDelete.accesskey;" |
247 + </panel> |
249 + command="Inspector:DeleteNode"/> |
|
250 + </menupopup> |
248 + |
251 + |
249 + <menupopup id="toolbar-context-menu" |
252 + <menupopup id="toolbar-context-menu" |
250 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
253 + onpopupshowing="onViewToolbarsPopupShowing(event);"> |
251 + <menuseparator/> |
254 + <menuseparator/> |
252 + <menuitem command="cmd_ToggleTabsOnTop" |
255 + <menuitem command="cmd_ToggleTabsOnTop" |
307 + <!-- Popup for site identity information --> |
310 + <!-- Popup for site identity information --> |
308 + <panel id="identity-popup" |
311 + <panel id="identity-popup" |
309 + type="arrow" |
312 + type="arrow" |
310 + hidden="true" |
313 + hidden="true" |
311 + noautofocus="true" |
314 + noautofocus="true" |
312 + onpopupshown="document.getElementById('identity-popup-more-info-button').focus();" |
315 + onpopupshown="gIdentityHandler.onPopupShown(event);" |
313 + level="top"> |
316 + level="top"> |
314 + <hbox id="identity-popup-container" align="top"> |
317 + <hbox id="identity-popup-container" align="top"> |
315 + <image id="identity-popup-icon"/> |
318 + <image id="identity-popup-icon"/> |
316 + <vbox id="identity-popup-content-box"> |
319 + <vbox id="identity-popup-content-box"> |
317 + <label id="identity-popup-connectedToLabel" |
320 + <label id="identity-popup-connectedToLabel" |
527 + <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> |
530 + <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> |
528 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
531 + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> |
529 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
532 + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> |
530 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
533 + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> |
531 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
534 + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> |
|
535 + <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> |
532 + </box> |
536 + </box> |
533 + <!-- Use onclick instead of normal popup= syntax since the popup |
537 + <!-- Use onclick instead of normal popup= syntax since the popup |
534 + code fires onmousedown, and hence eats our favicon drag events. |
538 + code fires onmousedown, and hence eats our favicon drag events. |
535 + We only add the identity-box button to the tab order when the location bar |
539 + We only add the identity-box button to the tab order when the location bar |
536 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
540 + has focus, otherwise pressing F6 focuses it instead of the location bar --> |
853 + |
857 + |
854 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
858 + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
855 + label="&printButton.label;" command="cmd_print" |
859 + label="&printButton.label;" command="cmd_print" |
856 + tooltiptext="&printButton.tooltip;"/> |
860 + tooltiptext="&printButton.tooltip;"/> |
857 + |
861 + |
858 + <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center" |
|
859 + mousethrough="always"> |
|
860 + <image/> |
|
861 + </toolbaritem> |
|
862 + |
|
863 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
862 + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
864 + observes="Tools:Downloads" |
863 + observes="Tools:Downloads" |
865 + ondrop="DownloadsButtonDNDObserver.onDrop(event)" |
864 + ondrop="DownloadsButtonDNDObserver.onDrop(event)" |
866 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" |
865 + ondragover="DownloadsButtonDNDObserver.onDragOver(event)" |
867 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
866 + ondragenter="DownloadsButtonDNDObserver.onDragOver(event)" |
887 + tooltiptext="&newWindowButton.tooltip;" |
886 + tooltiptext="&newWindowButton.tooltip;" |
888 + ondrop="newWindowButtonObserver.onDrop(event)" |
887 + ondrop="newWindowButtonObserver.onDrop(event)" |
889 + ondragover="newWindowButtonObserver.onDragOver(event)" |
888 + ondragover="newWindowButtonObserver.onDragOver(event)" |
890 + ondragenter="newWindowButtonObserver.onDragOver(event)" |
889 + ondragenter="newWindowButtonObserver.onDragOver(event)" |
891 + ondragexit="newWindowButtonObserver.onDragExit(event)"/> |
890 + ondragexit="newWindowButtonObserver.onDragExit(event)"/> |
892 + |
|
893 + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
894 + label="&cutCmd.label;" |
|
895 + command="cmd_cut" |
|
896 + tooltiptext="&cutButton.tooltip;"/> |
|
897 + |
|
898 + <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
899 + label="©Cmd.label;" |
|
900 + command="cmd_copy" |
|
901 + tooltiptext="©Button.tooltip;"/> |
|
902 + |
|
903 + <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
904 + label="&pasteCmd.label;" |
|
905 + command="cmd_paste" |
|
906 + tooltiptext="&pasteButton.tooltip;"/> |
|
907 + |
891 + |
908 + <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
892 + <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
909 + observes="View:FullScreen" |
893 + observes="View:FullScreen" |
910 + type="checkbox" |
894 + type="checkbox" |
911 + label="&fullScreenCmd.label;" |
895 + label="&fullScreenCmd.label;" |
920 + <toolbarbutton id="zoom-in-button" class="toolbarbutton-1" |
904 + <toolbarbutton id="zoom-in-button" class="toolbarbutton-1" |
921 + label="&fullZoomEnlargeCmd.label;" |
905 + label="&fullZoomEnlargeCmd.label;" |
922 + command="cmd_fullZoomEnlarge" |
906 + command="cmd_fullZoomEnlarge" |
923 + tooltiptext="&zoomInButton.tooltip;"/> |
907 + tooltiptext="&zoomInButton.tooltip;"/> |
924 + </toolbaritem> |
908 + </toolbaritem> |
925 +#ifdef MOZ_SERVICES_SYNC |
909 + |
926 + <toolbarbutton id="sync-button" |
|
927 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
928 + label="&syncToolbarButton.label;" |
|
929 + oncommand="gSyncUI.handleToolbarButton()"/> |
|
930 +#endif |
|
931 + <toolbarbutton id="feed-button" |
910 + <toolbarbutton id="feed-button" |
932 + type="menu" |
911 + type="menu" |
933 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
912 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
934 + disabled="true" |
913 + disabled="true" |
935 + label="&feedButton.label;" |
914 + label="&feedButton.label;" |
940 + onpopupshowing="return FeedHandler.buildFeedList(this);" |
919 + onpopupshowing="return FeedHandler.buildFeedList(this);" |
941 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
920 + oncommand="return FeedHandler.subscribeToFeed(null, event);" |
942 + onclick="checkForMiddleClick(this, event);"/> |
921 + onclick="checkForMiddleClick(this, event);"/> |
943 + </toolbarbutton> |
922 + </toolbarbutton> |
944 + |
923 + |
|
924 + <toolbarbutton id="cut-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
925 + label="&cutCmd.label;" |
|
926 + command="cmd_cut" |
|
927 + tooltiptext="&cutButton.tooltip;"/> |
|
928 + |
|
929 + <toolbarbutton id="copy-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
930 + label="©Cmd.label;" |
|
931 + command="cmd_copy" |
|
932 + tooltiptext="©Button.tooltip;"/> |
|
933 + |
|
934 + <toolbarbutton id="paste-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
935 + label="&pasteCmd.label;" |
|
936 + command="cmd_paste" |
|
937 + tooltiptext="&pasteButton.tooltip;"/> |
|
938 + |
|
939 +#ifdef MOZ_SERVICES_SYNC |
|
940 + <toolbarbutton id="sync-button" |
|
941 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
|
942 + label="&syncToolbarButton.label;" |
|
943 + oncommand="gSyncUI.handleToolbarButton()"/> |
|
944 +#endif |
|
945 + |
|
946 + <toolbaritem id="navigator-throbber" title="&throbberItem.title;" align="center" pack="center" |
|
947 + mousethrough="always"> |
|
948 + <image/> |
|
949 + </toolbaritem> |
|
950 + |
945 + <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
951 + <toolbarbutton id="tabview-button" class="toolbarbutton-1 chromeclass-toolbar-additional" |
946 + label="&tabGroupsButton.label;" |
952 + label="&tabGroupsButton.label;" |
947 + command="Browser:ToggleTabView" |
953 + command="Browser:ToggleTabView" |
948 + tooltiptext="&tabGroupsButton.tooltip;" |
954 + tooltiptext="&tabGroupsButton.tooltip;" |
949 + observes="tabviewGroupsNumber"/> |
955 + observes="tabviewGroupsNumber"/> |
967 + <tabbrowser id="content" disablehistory="true" |
973 + <tabbrowser id="content" disablehistory="true" |
968 + flex="1" contenttooltip="aHTMLTooltip" |
974 + flex="1" contenttooltip="aHTMLTooltip" |
969 + tabcontainer="tabbrowser-tabs" |
975 + tabcontainer="tabbrowser-tabs" |
970 + contentcontextmenu="contentAreaContextMenu" |
976 + contentcontextmenu="contentAreaContextMenu" |
971 + autocompletepopup="PopupAutoComplete" |
977 + autocompletepopup="PopupAutoComplete" |
972 + onclick="return contentAreaClick(event, false);"/> |
978 + onclick="contentAreaClick(event, false);"/> |
973 + <statuspanel id="statusbar-display" inactive="true"/> |
979 + <statuspanel id="statusbar-display" inactive="true"/> |
974 + </vbox> |
980 + </vbox> |
975 + <splitter id="devtools-side-splitter" hidden="true"/> |
981 + <splitter id="devtools-side-splitter" hidden="true"/> |
976 + <vbox id="devtools-sidebar-box" hidden="true" |
982 + <vbox id="devtools-sidebar-box" hidden="true" |
977 + style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> |
983 + style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> |
994 + <vbox id="browser-bottombox" layer="true"> |
1000 + <vbox id="browser-bottombox" layer="true"> |
995 + <toolbar id="inspector-toolbar" |
1001 + <toolbar id="inspector-toolbar" |
996 + class="devtools-toolbar" |
1002 + class="devtools-toolbar" |
997 + nowindowdrag="true" |
1003 + nowindowdrag="true" |
998 + hidden="true"> |
1004 + hidden="true"> |
999 + <vbox flex="1"> |
|
1000 + <resizer id="inspector-top-resizer" flex="1" |
|
1001 + dir="top" disabled="true" |
|
1002 + element="inspector-tree-box"/> |
|
1003 + <hbox> |
|
1004 +#ifdef XP_MACOSX |
1005 +#ifdef XP_MACOSX |
1005 + <toolbarbutton id="highlighter-closebutton" |
1006 + <toolbarbutton id="highlighter-closebutton" |
1006 + oncommand="InspectorUI.closeInspectorUI(false);" |
1007 + oncommand="InspectorUI.closeInspectorUI(false);" |
1007 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1008 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1008 +#endif |
1009 +#endif |
1009 + <toolbarbutton id="inspector-inspect-toolbutton" |
1010 + <toolbarbutton id="inspector-inspect-toolbutton" |
1010 + class="devtools-toolbarbutton" |
1011 + class="devtools-toolbarbutton" |
1011 + label="&inspectButton.label;" |
1012 + command="Inspector:Inspect"/> |
1012 + accesskey="&inspectButton.accesskey;" |
1013 + <toolbarbutton id="inspector-treepanel-toolbutton" |
1013 + command="Inspector:Inspect"/> |
1014 + class="devtools-toolbarbutton" |
1014 + <arrowscrollbox id="inspector-breadcrumbs" |
1015 + label="&htmlPanel.label;" |
1015 + flex="1" orient="horizontal" |
1016 + accesskey="&htmlPanel.accesskey;" |
1016 + clicktoscroll="true"/> |
1017 + tooltiptext="&htmlPanel.tooltiptext;" |
1017 + <hbox id="inspector-tools"> |
1018 + command="Inspector:HTMLPanel"/> |
1018 + <toolbarbutton id="inspector-3D-button" |
1019 + <arrowscrollbox id="inspector-breadcrumbs" |
1019 + class="devtools-toolbarbutton" |
1020 + flex="1" orient="horizontal" |
1020 + hidden="true" |
1021 + clicktoscroll="true"/> |
1021 + label="&inspect3DViewButton.label;" |
1022 + <hbox id="inspector-tools"> |
1022 + accesskey="&inspect3DViewButton.accesskey;" |
1023 + <toolbarbutton id="inspector-3D-button" |
1023 + command="Inspector:Tilt"/> |
1024 + class="devtools-toolbarbutton" |
1024 + <toolbarbutton id="inspector-style-button" |
1025 + hidden="true" |
1025 + class="devtools-toolbarbutton" |
1026 + label="&inspect3DViewButton.label;" |
1026 + label="&inspectStyleButton.label;" |
1027 + accesskey="&inspect3DViewButton.accesskey;" |
1027 + accesskey="&inspectStyleButton.accesskey;" |
1028 + command="Inspector:Tilt"/> |
1028 + command="Inspector:Sidebar"/> |
1029 + <toolbarbutton id="inspector-style-button" |
1029 + <!-- registered tools go here --> |
1030 + class="devtools-toolbarbutton" |
1030 + </hbox> |
1031 + label="&inspectStyleButton.label;" |
|
1032 + accesskey="&inspectStyleButton.accesskey;" |
|
1033 + command="Inspector:Sidebar"/> |
|
1034 + <!-- registered tools go here --> |
|
1035 + </hbox> |
1031 +#ifndef XP_MACOSX |
1036 +#ifndef XP_MACOSX |
1032 + <toolbarbutton id="highlighter-closebutton" |
1037 + <toolbarbutton id="highlighter-closebutton" |
1033 + oncommand="InspectorUI.closeInspectorUI(false);" |
1038 + oncommand="InspectorUI.closeInspectorUI(false);" |
1034 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1039 + tooltiptext="&inspectCloseButton.tooltiptext;"/> |
1035 +#endif |
1040 +#endif |
1036 + </hbox> |
|
1037 + </vbox> |
|
1038 + </toolbar> |
1041 + </toolbar> |
1039 + <toolbar id="addon-bar" |
1042 + <toolbar id="addon-bar" |
1040 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
1043 + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" |
1041 + collapsed="true" |
1044 + collapsed="true" |
1042 + class="toolbar-primary chromeclass-toolbar" |
1045 + class="toolbar-primary chromeclass-toolbar" |
1055 + |
1058 + |
1056 +#ifndef XP_UNIX |
1059 +#ifndef XP_UNIX |
1057 + <svg:svg height="0"> |
1060 + <svg:svg height="0"> |
1058 + <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> |
1061 + <svg:mask id="winstripe-keyhole-forward-mask" maskContentUnits="objectBoundingBox"> |
1059 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
1062 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
1060 + <svg:circle cx="-0.46" cy="0.5" r="0.63"/> |
1063 + <svg:circle cx="-0.34" cy="0.5" r="0.61"/> |
1061 + </svg:mask> |
|
1062 + <svg:mask id="winstripe-keyhole-forward-mask-hover" maskContentUnits="objectBoundingBox"> |
|
1063 + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> |
|
1064 + <svg:circle cx="-0.35" cy="0.5" r="0.58"/> |
|
1065 + </svg:mask> |
1064 + </svg:mask> |
1066 + <svg:mask id="winstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> |
1065 + <svg:mask id="winstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> |
1067 + <svg:rect x="0" y="0" width="10000" height="50" fill="white"/> |
1066 + <svg:rect x="0" y="0" width="10000" height="50" fill="white"/> |
1068 + <svg:circle cx="-11" cy="13" r="15"/> |
1067 + <svg:circle cx="-11" cy="13" r="15"/> |
1069 + </svg:mask> |
1068 + </svg:mask> |
1122 + |
1121 + |
1123 +</window> |
1122 +</window> |
1124 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1123 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1125 --- a/browser/base/jar.mn |
1124 --- a/browser/base/jar.mn |
1126 +++ b/browser/base/jar.mn |
1125 +++ b/browser/base/jar.mn |
1127 @@ -23,16 +23,18 @@ browser.jar: |
1126 @@ -32,16 +32,18 @@ browser.jar: |
1128 content/browser/aboutHome-restore-icon-small.png (content/aboutHome-restore-icon-small.png) |
1127 content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) |
1129 content/browser/aboutHome-snippet1.png (content/aboutHome-snippet1.png) |
1128 content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) |
1130 content/browser/aboutHome-snippet2.png (content/aboutHome-snippet2.png) |
1129 content/browser/abouthome/noise.png (content/abouthome/noise.png) |
1131 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1130 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1132 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1131 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1133 * content/browser/browser.css (content/browser.css) |
1132 * content/browser/browser.css (content/browser.css) |
1134 * content/browser/browser.js (content/browser.js) |
1133 * content/browser/browser.js (content/browser.js) |
1135 * content/browser/browser.xul (content/browser.xul) |
1134 * content/browser/browser.xul (content/browser.xul) |
1136 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1135 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1137 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1136 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1138 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1137 * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) |
1139 * content/browser/content.js (content/content.js) |
1138 * content/browser/content.js (content/content.js) |
1140 * content/browser/fullscreen-video.xhtml (content/fullscreen-video.xhtml) |
|
1141 * content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1139 * content/browser/newtab/newTab.xul (content/newtab/newTab.xul) |
1142 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1140 * content/browser/newtab/newTab.js (content/newtab/newTab.js) |
1143 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1141 content/browser/newtab/newTab.css (content/newtab/newTab.css) |
1144 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1142 * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) |
1145 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
1143 * content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) |
|
1144 * content/browser/pageinfo/pageInfo.css (content/pageinfo/pageInfo.css) |
1146 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1145 diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp |
1147 --- a/browser/components/build/nsModule.cpp |
1146 --- a/browser/components/build/nsModule.cpp |
1148 +++ b/browser/components/build/nsModule.cpp |
1147 +++ b/browser/components/build/nsModule.cpp |
1149 @@ -41,17 +41,17 @@ |
1148 @@ -41,17 +41,17 @@ |
1150 #include "nsBrowserCompsCID.h" |
1149 #include "nsBrowserCompsCID.h" |
1275 |
1274 |
1276 diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp |
1275 diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp |
1277 new file mode 100644 |
1276 new file mode 100644 |
1278 --- /dev/null |
1277 --- /dev/null |
1279 +++ b/browser/components/shell/src/nsKDEShellService.cpp |
1278 +++ b/browser/components/shell/src/nsKDEShellService.cpp |
1280 @@ -0,0 +1,257 @@ |
1279 @@ -0,0 +1,264 @@ |
1281 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1280 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ |
1282 +/* ***** BEGIN LICENSE BLOCK ***** |
1281 +/* ***** BEGIN LICENSE BLOCK ***** |
1283 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
1282 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 |
1284 + * |
1283 + * |
1285 + * The contents of this file are subject to the Mozilla Public License Version |
1284 + * The contents of this file are subject to the Mozilla Public License Version |
1707 + |
1713 + |
1708 +#endif // nsunixshellservice_h____ |
1714 +#endif // nsunixshellservice_h____ |
1709 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1715 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in |
1710 --- a/browser/installer/package-manifest.in |
1716 --- a/browser/installer/package-manifest.in |
1711 +++ b/browser/installer/package-manifest.in |
1717 +++ b/browser/installer/package-manifest.in |
1712 @@ -450,16 +450,17 @@ |
1718 @@ -467,16 +467,17 @@ |
1713 #endif |
1719 #endif |
1714 #endif |
1720 #endif |
1715 |
1721 |
1716 ; [Default Preferences] |
1722 ; [Default Preferences] |
1717 ; All the pref files must be part of base to prevent migration bugs |
1723 ; All the pref files must be part of base to prevent migration bugs |