Sync: More UI fixes.

* Don't show the Dashboad link unless the user is signed in.
* Expand the select data types option whenever the Customize page is shown.

BUG=none
TEST=none

R=csilv@chromium.org

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

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

3 files changed, 13 insertions, 13 deletions

diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index e2f148c..f082103 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -21,7 +21,8 @@
         </tr>
         <tr>
           <td>
-            <button id="change-picture-button" i18n-content="changePicture"></button>
+            <button id="change-picture-button" i18n-content="changePicture">
+            </button>
           </td>
         </tr>
       </table>
@@ -50,7 +51,7 @@
         </div>
       </div>
       <a href="https://www.google.com/dashboard" id="privacy-dashboard-link"
-          i18n-content="privacyDashboardLink" target="_blank"></a>
+          i18n-content="privacyDashboardLink" target="_blank" hidden></a>
     </div>
   </section>
   <section>
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 7480389..45bbfba 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -116,6 +116,7 @@ cr.define('options', function() {
     setSyncSetupCompleted_: function(completed) {
       this.syncSetupCompleted = completed;
       this.setElementVisible_($('customize-sync'), completed);
+      $('privacy-dashboard-link').hidden = !completed;
     },
 
     setAccountPicture_: function(image) {
diff --git a/chrome/browser/sync/resources/configure.html b/chrome/browser/sync/resources/configure.html
index 5677fb3..77502e7 100644
--- a/chrome/browser/sync/resources/configure.html
+++ b/chrome/browser/sync/resources/configure.html
@@ -271,19 +271,17 @@ html[os='mac'] input[type='submit'] {
     }
   }
 
-  function showCustomizePage(chooseDataTypes) {
+  function showCustomizePage() {
     document.getElementById('confirm-sync-preferences').hidden = true;
     document.getElementById('customize-sync-preferences').hidden = false;
 
-    // If the user clicked on the 'Customize' link on the 'Sync Everything'
-    // page, he most likely intends to change the data types. Select the 'Choose
-    // data types' select option in this case.
-    if (chooseDataTypes) {
-      document.getElementById('sync-select-datatypes').selectedIndex = 1;
-      document.getElementById('chooseDataTypesBody').hidden = false;
-      setDataTypeCheckboxesEnabled(true);
-      checkAllDataTypeCheckboxes();
-    }
+    // If the user is shown the 'Customize' page, it's likely he intends to
+    // change the data types.  Select the 'Choose data types' option in this
+    // case.
+    document.getElementById('sync-select-datatypes').selectedIndex = 1;
+    document.getElementById('chooseDataTypesBody').hidden = false;
+    setDataTypeCheckboxesEnabled(true);
+    checkAllDataTypeCheckboxes();
   }
 
   function showSyncEverythingPage() {
@@ -537,7 +535,7 @@ html[os='mac'] input[type='submit'] {
     <div class="action-area">
       <div class="action-area-link-container">
         <a id="customize-link" href="#" i18n-content="customizelinklabel"
-            onclick="showCustomizePage(true);"></a>
+            onclick="showCustomizePage();"></a>
       </div> 
       <input id="okButton" type="button" i18n-values="value:syncEverything"
           onclick="sendConfiguration();">