Backed out changeset 92f37b7106a4 (bug 970769) on a CLOSED TREE r=bustage

This commit is contained in:
Tim Taubert 2014-03-12 16:33:59 -07:00
parent b04a0d5bc5
commit 7192454e4a
2 changed files with 3 additions and 10 deletions

View File

@ -444,14 +444,7 @@
accesskey="&toolsMenu.accesskey;">
<menupopup id="menu_ToolsPopup"
#ifdef MOZ_SERVICES_SYNC
<!--
-- We have to use setTimeout() here to avoid a
-- flickering menu bar when opening the Tools menu,
-- see bug 970769. This can be removed once we got
-- rid of the event loop spinning in
-- Weave.Status._authManager.
-->
onpopupshowing="setTimeout(() => gSyncUI.updateUI());"
onpopupshowing="gSyncUI.updateUI();"
#endif
>
<menuitem id="menu_openDownloads"

View File

@ -175,8 +175,8 @@
<broadcaster id="tabviewGroupsNumber" groups="1"/>
#ifdef MOZ_SERVICES_SYNC
<broadcaster id="sync-setup-state"/>
<broadcaster id="sync-syncnow-state" hidden="true"/>
<broadcaster id="sync-reauth-state" hidden="true"/>
<broadcaster id="sync-syncnow-state"/>
<broadcaster id="sync-reauth-state"/>
#endif
<broadcaster id="workOfflineMenuitemState"/>
<broadcaster id="socialSidebarBroadcaster" hidden="true"/>