Bug 1441965 - Hide synced tabs sidebar menu items with identity.fxaccounts.enabled. r?markh draft
authorEdouard Oger <eoger@fastmail.com>
Wed, 28 Feb 2018 14:44:19 -0500
changeset 761153 763299d45ee845b664e2b5cb8012777f567c404c
parent 761128 c50f5f846c2e6b4c8da1e80b6790926ad84c3450
push id100889
push userbmo:eoger@fastmail.com
push dateWed, 28 Feb 2018 19:44:42 +0000
reviewersmarkh
bugs1441965
milestone60.0a1
Bug 1441965 - Hide synced tabs sidebar menu items with identity.fxaccounts.enabled. r?markh MozReview-Commit-ID: DBDOvidfbls
browser/base/content/browser-menubar.inc
browser/base/content/browser.xul
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -207,16 +207,17 @@
                     <menuitem id="menu_bookmarksSidebar"
                               key="viewBookmarksSidebarKb"
                               observes="viewBookmarksSidebar"/>
                     <menuitem id="menu_historySidebar"
                               key="key_gotoHistory"
                               observes="viewHistorySidebar"
                               label="&historyButton.label;"/>
                     <menuitem id="menu_tabsSidebar"
+                              class="sync-ui-item"
                               observes="viewTabsSidebar"
                               label="&syncedTabs.sidebar.label;"/>
                   </menupopup>
                 </menu>
                 <menuseparator/>
                 <menu id="viewFullZoomMenu" label="&fullZoom.label;"
                       accesskey="&fullZoom.accesskey;"
                       onpopupshowing="FullZoom.updateMenu();">
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -293,17 +293,17 @@
                      class="subviewbutton subviewbutton-iconic"
                      key="key_gotoHistory"
                      observes="viewHistorySidebar"
                      oncommand="SidebarUI.show('viewHistorySidebar');">
         <observes element="viewHistorySidebar" attribute="checked"/>
       </toolbarbutton>
       <toolbarbutton id="sidebar-switcher-tabs"
                      label="&syncedTabs.sidebar.label;"
-                     class="subviewbutton subviewbutton-iconic"
+                     class="subviewbutton subviewbutton-iconic sync-ui-item"
                      observes="viewTabsSidebar"
                      oncommand="SidebarUI.show('viewTabsSidebar');">
         <observes element="viewTabsSidebar" attribute="checked"/>
       </toolbarbutton>
       <toolbarseparator/>
       <!-- Extension toolbarbuttons go here. -->
       <toolbarseparator id="sidebar-extensions-separator"/>
       <toolbarbutton id="sidebar-reverse-position"