Sync UI: Ensure the close button is shown.

Get rid of the multitude of close buttons.

BUG=124648
TEST=none
R=dbeam


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

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

chrome/browser/resources/sync_setup_overlay.html

 <div id="sync-setup-overlay" class="page" hidden>
+  <div class="close-button"></div>
   <div id="sync-setup-login" hidden>
     <div id="promo-title-container" hidden>
       <h1 i18n-content="promoTitle"></h1>
@@ -11,7 +12,6 @@
     </div>
     <div class="sync-main-content">
       <div id="sync-setup-login-content-column">
-        <div class="close-button"></div>
         <h1 id="sync-setup-overlay-title" i18n-content="syncSetupOverlay"></h1>
         <div class="sign-in">
           <div id="top-blurb-error" class="reset-hidden" hidden>
@@ -154,7 +154,6 @@
       </div>
     </div>
     <div id="customize-sync-preferences" hidden>
-      <div class="close-button"></div>
       <h1 i18n-content="syncSetupConfigureTitle"></h1>
       <form id="choose-data-types-form">
         <div id="sync-configure-content" class="content-area">
@@ -341,7 +340,6 @@
     </div>
   </div>
   <div id="sync-setup-spinner" hidden>
-    <div class="close-button"></div>
     <h1 i18n-content="syncSetupConfigureTitle"></h1>
     <div class="content-area">
       <div id="spinner-throbber" class="throbber"></div>
@@ -351,7 +349,6 @@
     </div>
   </div>
   <div id="sync-setup-stop-syncing" hidden>
-    <div class="close-button"></div>
     <h1 i18n-content="stopSyncingTitle"></h1>
     <div class="content-area">
       <span i18n-values=".innerHTML:stopSyncingExplanation"></span>

chrome/browser/resources/sync_setup_overlay.js

@@ -514,10 +514,12 @@ cr.define('options', function() {
     showSyncSetupPage_: function(page, args) {
       this.setThrobbersVisible_(false);
 
-      // Hide an existing visible overlay.
-      var overlay = $('sync-setup-overlay');
-      for (var i = 0; i < overlay.children.length; i++)
-        overlay.children[i].hidden = true;
+      // Hide an existing visible overlay (ensuring the close button is not
+      // hidden).
+      var children = document.querySelectorAll(
+          '#sync-setup-overlay > *:not(.close-button)');
+      for (var i = 0; i < children.length; i++)
+        children[i].hidden = true;
 
       this.setInputElementsDisabledState_(false);