Bug 924900 - Disable sync temporarily until pref service handles shared prefs. r=jimm

browser/metro/base/content/browser-ui.js

@@ -1303,11 +1303,15 @@ var SettingsCharm = {
         label: Strings.browser.GetStringFromName("optionsCharm"),
         onselected: function() FlyoutPanelsUI.show('PrefsFlyoutPanel')
     });
+/*
+ * Temporarily disabled until we can have sync prefs together with the
+ * Desktop browser's sync prefs.
     // Sync
     this.addEntry({
         label: Strings.brand.GetStringFromName("syncBrandShortName"),
         onselected: function() FlyoutPanelsUI.show('SyncFlyoutPanel')
     });
+*/
     // About
     this.addEntry({
         label: Strings.browser.GetStringFromName("aboutCharm1"),

browser/metro/base/content/browser.xul

@@ -142,10 +142,14 @@
     <!-- development/testing -->
     <key id="key_console" key="&jsConsole.key;" modifiers="accel,shift" oncommand="PanelUI.show('console-container')"/>
     <key id="key_options" key="&optionsFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('PrefsFlyoutPanel')" />
+    <key id="key_options" key="&aboutFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" />
+<!--
+Temporarily disabled until we can have sync prefs together with the
+Desktop browser's sync prefs.
 #ifdef MOZ_SERVICES_SYNC
     <key id="key_options" key="&syncFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('SyncFlyoutPanel')" />
 #endif
-    <key id="key_options" key="&aboutFlyout.key;" modifiers="accel,shift" oncommand="FlyoutPanelsUI.show('AboutFlyoutPanel')" />
+-->
 
     <!-- manage tabs -->
     <key id="key_newTab" key="&newTab.key;" modifiers="accel" command="cmd_newTab"/>