Merge 130722 - On ChromeOS, the user is always signed in and we should not

chrome/browser/resources/sync_setup_overlay.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   const OptionsPage = options.OptionsPage;
 
   // Variable to track if a captcha challenge was issued. If this gets set to
   // true, it stays that way until we are told about successful login from
   // the browser.  This means subsequent errors (like invalid password) are
@@ skipping 33 matching lines @@
       $('gaia-login-form').onsubmit = function() {
         self.sendCredentialsAndClose_();
         return false;
       };
       $('google-option').onchange = $('explicit-option').onchange = function() {
         self.onPassphraseRadioChanged_();
       };
       $('choose-datatypes-cancel').onclick =
           $('sync-setup-cancel').onclick =
           $('confirm-everything-cancel').onclick =
-          $('stop-syncing-cancel').onclick =  function() {
+          $('stop-syncing-cancel').onclick =
+          $('sync-spinner-cancel').onclick = function() {
         self.closeOverlay_();
       };
       $('confirm-everything-ok').onclick = function() {
         self.sendConfiguration_();
       };
       $('stop-syncing-ok').onclick = function() {
         chrome.send('stopSyncing');
         self.closeOverlay_();
       };
     },
@@ skipping 324 matching lines @@
         this.usePassphrase_ = args['usePassphrase'];
         if (args['showSyncEverythingPage'] == false || this.usePassphrase_ ||
             syncAllDataTypes == false || args['show_passphrase']) {
           this.showCustomizePage_(args, syncAllDataTypes);
         } else {
           this.showSyncEverythingPage_();
         }
       }
     },
 
+    showSpinner_: function() {
+      this.resetPage_('sync-setup-spinner');
+      $('sync-setup-spinner').hidden = false;
+      this.setThrobbersVisible_(true);
+    },
+
     showSyncEverythingPage_: function() {
       $('confirm-sync-preferences').hidden = false;
       $('customize-sync-preferences').hidden = true;
 
       // Reset the selection to 'Sync everything'.
       $('sync-select-datatypes').selectedIndex = 0;
 
       // The default state is to sync everything.
       this.setCheckboxesToKeepEverythingSynced_(true);
 
@@ skipping 104 matching lines @@
       // doesn't work).
       if (page == 'done')
         this.closeOverlay_();
       else
         this.showOverlay_();
 
       if (page == 'login')
         this.showGaiaLogin_(args);
       else if (page == 'configure' || page == 'passphrase')
         this.showConfigure_(args);
+      else if (page == 'spinner')
+        this.showSpinner_();
     },
 
     /**
      * Changes the visibility of throbbers on this page.
      * @param {boolean} visible Whether or not to set all throbber nodes
      *     visible.
      */
     setThrobbersVisible_: function(visible) {
       var throbbers = document.getElementsByClassName('throbber');
       for (var i = 0; i < throbbers.length; i++)
@@ skipping 337 matching lines @@
 
   SyncSetupOverlay.showStopSyncingUI = function() {
     SyncSetupOverlay.getInstance().showStopSyncingUI_();
   };
 
   // Export
   return {
     SyncSetupOverlay: SyncSetupOverlay
   };
 });