Bug 610919 - Move "Sync Now" to the left side of the Firefox menu. r=dao, a=dtownsend
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Thu, 13 Jan 2011 16:07:47 -0800
changeset 60480 c53984e562b851490771804113e9cc421c29cf90
parent 60479 bdadb18a5adfaa2aff17098ed5c0c2ad6e030146
child 60481 ae9db11e316dd2d563d10778837cda740294ee5a
push id18013
push usermargaret.leibovic@gmail.com
push dateFri, 14 Jan 2011 01:18:05 +0000
treeherdermozilla-central@c53984e562b8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao, dtownsend
bugs610919
milestone2.0b10pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 610919 - Move "Sync Now" to the left side of the Firefox menu. r=dao, a=dtownsend
browser/base/content/browser-appmenu.inc
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -169,16 +169,27 @@
 #undef ID_PREFIX
 #undef OMIT_ACCESSKEYS
       <menuitem id="appmenu_fullScreen"
                 class="menuitem-tooltip"
                 label="&fullScreenCmd.label;"
                 type="checkbox"
                 observes="View:FullScreen"
                 key="key_fullScreen"/>
+#ifdef MOZ_SERVICES_SYNC
+      <!-- only one of sync-setup or sync-syncnow will be showing at once -->
+      <menuitem id="sync-setup-appmenu"
+                label="&syncSetup.label;"
+                observes="sync-setup-state"
+                oncommand="gSyncUI.openSetup()"/>
+      <menuitem id="sync-syncnowitem-appmenu"
+                label="&syncSyncNowItem.label;"
+                observes="sync-syncnow-state"
+                oncommand="gSyncUI.doSync(event);"/>
+#endif
       <menuitem id="appmenu-quit"
                 class="menuitem-iconic"
 #ifdef XP_WIN
                 label="&quitApplicationCmdWin.label;"
 #else
                 label="&quitApplicationCmd.label;"
 #endif
                 command="cmd_quitApplication"/>
@@ -356,23 +367,11 @@
                       label="&appMenuSafeMode.label;"
                       oncommand="safeModeRestart();"/>
             <menuseparator/>
             <menuitem id="appmenu_about"
                       label="&aboutProduct.label;"
                       oncommand="openAboutDialog();"/>
           </menupopup>
       </splitmenu>
-#ifdef MOZ_SERVICES_SYNC
-      <spacer flex="1"/>
-      <!-- only one of sync-setup or sync-syncnow will be showing at once -->
-      <menuitem id="sync-setup-appmenu"
-                label="&syncSetup.label;"
-                observes="sync-setup-state"
-                oncommand="gSyncUI.openSetup()"/>
-      <menuitem id="sync-syncnowitem-appmenu"
-                label="&syncSyncNowItem.label;"
-                observes="sync-syncnow-state"
-                oncommand="gSyncUI.doSync(event);"/>
-#endif
     </vbox>
   </hbox>
 </menupopup>