diff options
Diffstat (limited to 'application/basilisk/base')
6 files changed, 12 insertions, 19 deletions
diff --git a/application/basilisk/base/content/abouthome/aboutHome.css b/application/basilisk/base/content/abouthome/aboutHome.css index bc3f9882c..86f74727f 100644 --- a/application/basilisk/base/content/abouthome/aboutHome.css +++ b/application/basilisk/base/content/abouthome/aboutHome.css @@ -283,9 +283,11 @@ body[narrow] #restorePreviousSession { content: url("chrome://browser/content/abouthome/addons.png"); } +%ifdef MOZ_SERVICES_SYNC #sync::before { content: url("chrome://browser/content/abouthome/sync.png"); } +%endif #settings::before { content: url("chrome://browser/content/abouthome/settings.png"); @@ -369,9 +371,11 @@ body[narrow] #restorePreviousSession::before { content: url("chrome://browser/content/abouthome/addons@2x.png"); } +%ifdef MOZ_SERVICES_SYNC #sync::before { content: url("chrome://browser/content/abouthome/sync@2x.png"); } +%endif #settings::before { content: url("chrome://browser/content/abouthome/settings@2x.png"); diff --git a/application/basilisk/base/content/abouthome/aboutHome.xhtml b/application/basilisk/base/content/abouthome/aboutHome.xhtml index 22bf2e7e8..90daad2dc 100644 --- a/application/basilisk/base/content/abouthome/aboutHome.xhtml +++ b/application/basilisk/base/content/abouthome/aboutHome.xhtml @@ -54,7 +54,9 @@ <button class="launchButton" id="bookmarks">&abouthome.bookmarksButton.label;</button> <button class="launchButton" id="history">&abouthome.historyButton.label;</button> <button class="launchButton" id="addons">&abouthome.addonsButton.label;</button> +#ifdef MOZ_SERVICES_SYNC <button class="launchButton" id="sync">&abouthome.syncButton.label;</button> +#endif #ifdef XP_WIN <button class="launchButton" id="settings">&abouthome.preferencesButtonWin.label;</button> #else diff --git a/application/basilisk/base/content/browser-context.inc b/application/basilisk/base/content/browser-context.inc index 2f6b19da0..d400cd0b2 100644 --- a/application/basilisk/base/content/browser-context.inc +++ b/application/basilisk/base/content/browser-context.inc @@ -249,13 +249,6 @@ accesskey="&savePageCmd.accesskey2;" oncommand="gContextMenu.savePageAs();"/> <menuseparator id="context-sep-sendpagetodevice" hidden="true"/> - <menu id="context-sendpagetodevice" - label="&sendPageToDevice.label;" - accesskey="&sendPageToDevice.accesskey;" - hidden="true"> - <menupopup id="context-sendpagetodevice-popup" - onpopupshowing="(() => { let browser = gBrowser || getPanelBrowser(); gFxAccounts.populateSendTabToDevicesMenu(event.target, browser.currentURI.spec, browser.contentTitle); })()"/> - </menu> <menuseparator id="context-sep-viewbgimage"/> <menuitem id="context-viewbgimage" label="&viewBGImageCmd.label;" @@ -296,13 +289,6 @@ <menuitem id="context-searchselect" oncommand="BrowserSearch.loadSearchFromContext(this.searchTerms);"/> <menuseparator id="context-sep-sendlinktodevice" hidden="true"/> - <menu id="context-sendlinktodevice" - label="&sendLinkToDevice.label;" - accesskey="&sendLinkToDevice.accesskey;" - hidden="true"> - <menupopup id="context-sendlinktodevice-popup" - onpopupshowing="gFxAccounts.populateSendTabToDevicesMenu(event.target, gContextMenu.linkURL, gContextMenu.linkTextStr);"/> - </menu> <menuseparator id="frame-sep"/> <menu id="frame" label="&thisFrameMenu.label;" accesskey="&thisFrameMenu.accesskey;"> <menupopup> diff --git a/application/basilisk/base/content/browser-doctype.inc b/application/basilisk/base/content/browser-doctype.inc index ad08f4b03..30d70ccea 100644 --- a/application/basilisk/base/content/browser-doctype.inc +++ b/application/basilisk/base/content/browser-doctype.inc @@ -19,7 +19,9 @@ #endif <!ENTITY % aboutHomeDTD SYSTEM "chrome://browser/locale/aboutHome.dtd"> %aboutHomeDTD; +#ifdef MOZ_SERVICES_SYNC <!ENTITY % syncBrandDTD SYSTEM "chrome://browser/locale/syncBrand.dtd"> %syncBrandDTD; +#endif ]> diff --git a/application/basilisk/base/content/browser.xul b/application/basilisk/base/content/browser.xul index d99ac9bc8..91299de29 100644 --- a/application/basilisk/base/content/browser.xul +++ b/application/basilisk/base/content/browser.xul @@ -100,11 +100,6 @@ tbattr="tabbrowser-multiple" oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> <menuseparator id="context_sendTabToDevice_separator" hidden="true"/> - <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" - accesskey="&sendTabToDevice.accesskey;" hidden="true"> - <menupopup id="context_sendTabToDevicePopupMenu" - onpopupshowing="gFxAccounts.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> - </menu> <menuseparator/> <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" tbattr="tabbrowser-multiple-visible" diff --git a/application/basilisk/base/jar.mn b/application/basilisk/base/jar.mn index 126312cd5..72061a622 100644 --- a/application/basilisk/base/jar.mn +++ b/application/basilisk/base/jar.mn @@ -24,7 +24,9 @@ browser.jar: content/browser/abouthome/bookmarks.png (content/abouthome/bookmarks.png) content/browser/abouthome/history.png (content/abouthome/history.png) content/browser/abouthome/addons.png (content/abouthome/addons.png) +#ifdef MOZ_SERVICES_SYNC content/browser/abouthome/sync.png (content/abouthome/sync.png) +#endif content/browser/abouthome/settings.png (content/abouthome/settings.png) content/browser/abouthome/restore.png (content/abouthome/restore.png) content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) @@ -35,7 +37,9 @@ browser.jar: content/browser/abouthome/bookmarks@2x.png (content/abouthome/bookmarks@2x.png) content/browser/abouthome/history@2x.png (content/abouthome/history@2x.png) content/browser/abouthome/addons@2x.png (content/abouthome/addons@2x.png) +#ifdef MOZ_SERVICES_SYNC content/browser/abouthome/sync@2x.png (content/abouthome/sync@2x.png) +#endif content/browser/abouthome/settings@2x.png (content/abouthome/settings@2x.png) content/browser/abouthome/restore@2x.png (content/abouthome/restore@2x.png) content/browser/abouthome/restore-large@2x.png (content/abouthome/restore-large@2x.png) |