Revert 64127 - sync: hide encryption tabstrip

BUG=59631
TEST=open configure dialog, note no 'Data Type'/'Encryption' tabstrip.

Review URL: http://codereview.chromium.org/4155006

TBR=tim@chromium.org
Review URL: http://codereview.chromium.org/4097007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64149 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 16 deletions

diff --git a/chrome/browser/sync/resources/configure.html b/chrome/browser/sync/resources/configure.html
index 349a9d0..0ba65c4 100644
--- a/chrome/browser/sync/resources/configure.html
+++ b/chrome/browser/sync/resources/configure.html
@@ -53,7 +53,6 @@ form {
   margin-bottom: 10px;
   padding-top: 10px;
   background-color: #DDD;
-  display: none;
 }
 .sync-config-tab-active {
   background-color: white;
@@ -188,18 +187,18 @@ html[os='mac'] input[type='submit'] {
     setChooseDataTypesCheckboxes(args);
     setEncryptionCheckboxes(args);
     setErrorState(args);
-  }
-
-  function checkAllDataTypeCheckboxes() {
-    var checkboxes = document.getElementsByName("dataTypeCheckbox");
-    for (var i = 0; i < checkboxes.length; i++) {
-      checkboxes[i].checked = true;
-    }
-  }
-
-  function setCheckboxesToKeepEverythingSynced(value) {
-    setDataTypeCheckboxesEnabled(!value);
-    if (value)
+  }

+

+  function checkAllDataTypeCheckboxes() {

+    var checkboxes = document.getElementsByName("dataTypeCheckbox");

+    for (var i = 0; i < checkboxes.length; i++) {

+      checkboxes[i].checked = true;

+    }

+  }

+

+  function setCheckboxesToKeepEverythingSynced(value) {

+    setDataTypeCheckboxesEnabled(!value);

+    if (value)

       checkAllDataTypeCheckboxes();
   }
 
@@ -251,9 +250,9 @@ html[os='mac'] input[type='submit'] {
           args.syncApps;
       document.getElementById("appsItem").className = "sync-item-show";
     } else {
-      document.getElementById("appsItem").className = "sync-item-hide";
-    }
-
+      document.getElementById("appsItem").className = "sync-item-hide";

+    }

+

     setCheckboxesToKeepEverythingSynced(args.keepEverythingSynced);
     if (args.sessionsRegistered) {
       document.getElementById("sessionsCheckbox").checked = args.syncSessions;