From e8c2abd405578f4749c140d9eb6319ec06420d34 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Fri, 15 Mar 2013 10:29:55 -0400
Subject: [PATCH] Bug 831614 - Desktop sync UI checkbox for Setting up Sync for
 Metro at the same time. r=jaws

---
 browser/base/content/sync/setup.js                 | 22 ++++++++++++++++++++++
 browser/base/content/sync/setup.xul                | 14 ++++++++++++++
 browser/base/jar.mn                                |  4 ++--
 browser/locales/en-US/chrome/browser/syncSetup.dtd |  3 +++
 browser/themes/windows/syncSetup.css               |  5 +++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/sync/setup.js b/browser/base/content/sync/setup.js
index de2bfb1d9d31..3b07c9df0412 100644
--- a/browser/base/content/sync/setup.js
+++ b/browser/base/content/sync/setup.js
@@ -417,6 +417,21 @@ var gSyncSetup = {
     }
   },
 
+#ifdef XP_WIN
+#ifdef MOZ_METRO
+  _securelyStoreForMetroSync: function(weaveEmail, weavePassword, weaveKey) {
+    try {
+      let metroUtils = Cc["@mozilla.org/windows-metroutils;1"].
+                       createInstance(Ci.nsIWinMetroUtils);
+      if (!metroUtils)
+          return;
+      metroUtils.storeSyncInfo(weaveEmail, weavePassword, weaveKey);
+    } catch (ex) {
+    }
+  },
+#endif
+#endif
+
   onWizardAdvance: function () {
     // Check pageIndex so we don't prompt before the Sync setup wizard appears.
     // This is a fallback in case the Master Password gets locked mid-wizard.
@@ -471,6 +486,13 @@ var gSyncSetup = {
           Weave.Service.identity.syncKey = Weave.Utils.generatePassphrase();
           this._handleNoScript(false);
           Weave.Svc.Prefs.set("firstSync", "newAccount");
+#ifdef XP_WIN
+#ifdef MOZ_METRO
+          if (document.getElementById("metroSetupCheckbox").checked) {
+            this._securelyStoreForMetroSync(email, password, Weave.Service.identity.syncKey);
+          }
+#endif
+#endif
           this.wizardFinish();
           return false;
         }
diff --git a/browser/base/content/sync/setup.xul b/browser/base/content/sync/setup.xul
index 9b75a1dbf62c..f01dad9f9926 100644
--- a/browser/base/content/sync/setup.xul
+++ b/browser/base/content/sync/setup.xul
@@ -172,6 +172,20 @@
             <label class="status" value=" "/>
           </hbox>
         </row>
+#ifdef XP_WIN
+#ifdef MOZ_METRO
+        <row id="metroRow" align="center">
+          <spacer/>
+          <hbox align="center">
+            <checkbox label="&setup.setupMetro.label;"
+                      accesskey="&setup.setupMetro.accesskey;"
+                      control="weavePasswordConfirm"
+                      id="metroSetupCheckbox"
+                      checked="true"/>
+          </hbox>
+        </row>
+#endif
+#endif
         <row id="TOSRow" align="center">
           <spacer/>
           <hbox align="center">
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
index dbbe40f85470..e4e05c5877b4 100644
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -79,10 +79,10 @@ browser.jar:
         content/browser/sync/aboutSyncTabs.js         (content/sync/aboutSyncTabs.js)
         content/browser/sync/aboutSyncTabs.css        (content/sync/aboutSyncTabs.css)
         content/browser/sync/aboutSyncTabs-bindings.xml  (content/sync/aboutSyncTabs-bindings.xml)
-        content/browser/sync/setup.xul                (content/sync/setup.xul)
+*       content/browser/sync/setup.xul                (content/sync/setup.xul)
         content/browser/sync/addDevice.js             (content/sync/addDevice.js)
         content/browser/sync/addDevice.xul            (content/sync/addDevice.xul)
-        content/browser/sync/setup.js                 (content/sync/setup.js)
+*       content/browser/sync/setup.js                 (content/sync/setup.js)
         content/browser/sync/genericChange.xul        (content/sync/genericChange.xul)
         content/browser/sync/genericChange.js         (content/sync/genericChange.js)
         content/browser/sync/key.xhtml                (content/sync/key.xhtml)
diff --git a/browser/locales/en-US/chrome/browser/syncSetup.dtd b/browser/locales/en-US/chrome/browser/syncSetup.dtd
index 79dbf0ffa6cc..a8f005000c07 100644
--- a/browser/locales/en-US/chrome/browser/syncSetup.dtd
+++ b/browser/locales/en-US/chrome/browser/syncSetup.dtd
@@ -33,6 +33,9 @@
 <!ENTITY setup.choosePassword.accesskey  "P">
 <!ENTITY setup.confirmPassword.label     "Confirm Password">
 <!ENTITY setup.confirmPassword.accesskey "m">
+<!ENTITY setup.setupMetro.label     "Sync with Windows 8 style &brandShortName;">
+<!ENTITY setup.setupMetro.accesskey "S">
+
 <!-- LOCALIZATION NOTE: tosAgree1, tosLink, tosAgree2, ppLink, tosAgree3 are
      joined with implicit white space, so spaces in the strings aren't necessary -->
 <!ENTITY setup.tosAgree1.label      "I agree to the">
diff --git a/browser/themes/windows/syncSetup.css b/browser/themes/windows/syncSetup.css
index 4c6518a1b74c..fff65e9632a2 100644
--- a/browser/themes/windows/syncSetup.css
+++ b/browser/themes/windows/syncSetup.css
@@ -125,3 +125,8 @@ description > .text-link:focus {
   /* TODO replace this with a 128px version (bug 591122) */
   list-style-image: url("chrome://browser/skin/sync-32.png");
 }
+
+#tosDesc {
+  margin-left: -7px;
+  margin-bottom: 3px;
+}
\ No newline at end of file
-- 
2.11.4.GIT